Changeset 83

User picture

Author: ahaurw01

(2009/04/07 21:24) Almost 3 years ago

fixed music problems, can now return to the main menu after losing or winning

Affected files

Updated Bump_n_Jump/levels/level2.txt Download diff

8283
6
#                            #
6
#                            #
7
#                            #
7
#                            #
8
#                            #
8
#                            #
 
9
#                            #



10
#   *   *  *  *  *  *   *    #
9
#   *   *  *  *  *  *   *    #



11
#  o                      D  #
10
#  o                      D  #



12
#                 w          #
11
#                 w          #


...
...
24
#                            #
23
#                            #



25
#            ######          #
24
#            ######          #



26
########                     #
25
########                     #



27
#                w           #



28
#                            #
26
#                            #



27
#                            #



28
##############################



29
##############################
29
##############################





          

  Updated
Bump_n_Jump/levels/level3.txt  Download diff




      
      
8283
9
#                            #
9
#                            #



10
#                            #
10
#                            #



11
#                            #
11
#                            #



12
#                 w          #



13
#                            #
12
#                            #



14
##############################
13
##############################



15
#              * *           #
14
#              * *           #


...
...
17
#D                           #
16
#D                           #



18
#       * *      x      * *  #
17
#       * *      x      * *  #



19
#              p#p#          #
18
#              p#p#          #



20
#00                          #
19
#000                         #



21
#       ^    * * *           #
20
#       ^    * * *           #



22
#* * *  0000            #p#p #
21
#* * *  0000            #p#p #



23
#                            #
22
#                            #


...
...
26
##p#p#p#                     #
25
##p#p#p#                     #



27
#                w        o  #
26
#                w        o  #



28
#        ^                   #
27
#        ^                   #



28
##############################



29
##############################
29
##############################





          


  Added
Bump_n_Jump/levels/level5.txt  






  
    

      

        
          
                Show contents
                 
      

      
    

  






          


  Added
Bump_n_Jump/levels/level6.txt  






  
    

      

        
          
                Show contents
                 
      

      
    

  






          

  Updated
Bump_n_Jump/src/BallSprite.java  Download diff




      
      
8283
212
		return false;
212
		return false;



213
	}
213
	}



214
214



215
	public Ellipse2D getCircle() {



216
		return circle;



217
	}



218



215
}
219
}





          

  Updated
Bump_n_Jump/src/Game.java  Download diff




      
      
8283
79
		newLevelSnd		=	new SoundPlayback("music/NewLevel.aif");
79
		newLevelSnd		=	new SoundPlayback("music/NewLevel.aif");



80
		levelMusicSnd	=	new SoundPlayback("music/Level_music.aif", true);
80
		levelMusicSnd	=	new SoundPlayback("music/Level_music.aif", true);



81
		gameplaySnd		=	new SoundPlayback("music/gameplaymusic.aif");
81
		gameplaySnd		=	new SoundPlayback("music/gameplaymusic.aif");



82
		openingSnd		=	new SoundPlayback("music/openingmusic.aif", true);
82
		openingSnd		=	new SoundPlayback("music/openingmusic.aif");



83
		
83
		



84
84



85
		livesLeft = 6;
85
		livesLeft = 1;



86
		levelNum = 0;
86
		levelNum = 0;



87
		levelCreator = new LevelCreator();
87
		levelCreator = new LevelCreator();



88
		nextLevel();
88
		nextLevel();


...
...
105
		openingSnd.start();
105
		openingSnd.start();



106
	}
106
	}



107
	
107
	



108
	private void startEverythingOver() {



109
		livesLeft = 1;



110
		levelNum = 0;



111
		levelCreator = new LevelCreator();



112
		nextLevel();



113
		



114
		//create new thread



115
		mainLoop = new Thread(this);



116
		gameStarted = beatTheGame = gameOver = false;



117
		menuScreen = MENU;



118
		gameplaySnd.stop();



119
		openingSnd.start();



120
		menuScreen();



121
	}



122
	



108
	/**
123
	/**



109
	 * shows the menu screen with options to show instructions, play the game, and quit.
124
	 * shows the menu screen with options to show instructions, play the game, and quit.



110
	 */
125
	 */


...
...
137
			if (bs.isDead()) {
152
			if (bs.isDead()) {



138
				deadSnd.stop();
153
				deadSnd.stop();



139
				deadSnd.start();
154
				deadSnd.start();



140
				//deadSnd.stop();



141
155



142
				if (livesLeft == 0) {
156
				if (livesLeft == 0) {



143
					// Stop level music at end of game
157
					// Stop level music at end of game



144
					levelMusicSnd.stop();
158
					gameplaySnd.stop();



145



146
					gameStarted = false;
159
					gameStarted = false;



147
					gameOver = true;
160
					gameOver = true;



161
					bs.getCircle().setFrame(-10, -10, 0,0);



162
					bs.setIsDead(false);



148
					try {
163
					try {



149
						Thread.sleep(1000L);
164
						Thread.sleep(1000L);



150
					} catch (InterruptedException e) {}
165
					} catch (InterruptedException e) {}


...
...
326
				g.drawImage(arrow, arrowX, arrowY, null);
341
				g.drawImage(arrow, arrowX, arrowY, null);



327
			}
342
			}



328
			else if (beatTheGame) {
343
			else if (beatTheGame) {



344
				mainLoop = null;



329
				g.drawImage(menuImageBeat, 0, 0, null);
345
				g.drawImage(menuImageBeat, 0, 0, null);



330
			}
346
			}



331
			else if (gameOver) {
347
			else if (gameOver) {



348
				mainLoop = null;



332
				g.drawImage(menuImageGameOver, 0, 0, null);
349
				g.drawImage(menuImageGameOver, 0, 0, null);



350
				deadSnd.stop();



333
			}
351
			}



334
			
352
			



335
		}
353
		}


...
...
503
				arrowY = ARROWY1;
521
				arrowY = ARROWY1;



504
				repaint();
522
				repaint();



505
			}
523
			}



524
			else if ((gameOver && !gameStarted) || beatTheGame){



525
				gameOver = false;



526
				gameStarted = false;



527
				startEverythingOver();



528
			}



506
		}
529
		}



507
		else if (e.getKeyCode() == KeyEvent.VK_F12) {
530
		else if (e.getKeyCode() == KeyEvent.VK_F12) {



508
			nextLevel();
531
			nextLevel();





    

          

  Updated
Project Folder/bump_n_jump/BallSprite.java  Download diff




      
      
8283
212
		return false;
212
		return false;



213
	}
213
	}



214
214



215
	public Ellipse2D getCircle() {



216
		return circle;



217
	}



218



215
}
219
}





    

    

    

          

  Updated
Project Folder/bump_n_jump/Game.java  Download diff




      
      
8283
79
		newLevelSnd		=	new SoundPlayback("music/NewLevel.aif");
79
		newLevelSnd		=	new SoundPlayback("music/NewLevel.aif");



80
		levelMusicSnd	=	new SoundPlayback("music/Level_music.aif", true);
80
		levelMusicSnd	=	new SoundPlayback("music/Level_music.aif", true);



81
		gameplaySnd		=	new SoundPlayback("music/gameplaymusic.aif");
81
		gameplaySnd		=	new SoundPlayback("music/gameplaymusic.aif");



82
		openingSnd		=	new SoundPlayback("music/openingmusic.aif", true);
82
		openingSnd		=	new SoundPlayback("music/openingmusic.aif");



83
		
83
		



84
84



85
		livesLeft = 6;
85
		livesLeft = 1;



86
		levelNum = 0;
86
		levelNum = 0;



87
		levelCreator = new LevelCreator();
87
		levelCreator = new LevelCreator();



88
		nextLevel();
88
		nextLevel();


...
...
105
		openingSnd.start();
105
		openingSnd.start();



106
	}
106
	}



107
	
107
	



108
	private void startEverythingOver() {



109
		livesLeft = 1;



110
		levelNum = 0;



111
		levelCreator = new LevelCreator();



112
		nextLevel();



113
		



114
		//create new thread



115
		mainLoop = new Thread(this);



116
		gameStarted = beatTheGame = gameOver = false;



117
		menuScreen = MENU;



118
		gameplaySnd.stop();



119
		openingSnd.start();



120
		menuScreen();



121
	}



122
	



108
	/**
123
	/**



109
	 * shows the menu screen with options to show instructions, play the game, and quit.
124
	 * shows the menu screen with options to show instructions, play the game, and quit.



110
	 */
125
	 */


...
...
137
			if (bs.isDead()) {
152
			if (bs.isDead()) {



138
				deadSnd.stop();
153
				deadSnd.stop();



139
				deadSnd.start();
154
				deadSnd.start();



140
				//deadSnd.stop();



141
155



142
				if (livesLeft == 0) {
156
				if (livesLeft == 0) {



143
					// Stop level music at end of game
157
					// Stop level music at end of game



144
					levelMusicSnd.stop();
158
					gameplaySnd.stop();



145



146
					gameStarted = false;
159
					gameStarted = false;



147
					gameOver = true;
160
					gameOver = true;



161
					bs.getCircle().setFrame(-10, -10, 0,0);



162
					bs.setIsDead(false);



148
					try {
163
					try {



149
						Thread.sleep(1000L);
164
						Thread.sleep(1000L);



150
					} catch (InterruptedException e) {}
165
					} catch (InterruptedException e) {}


...
...
326
				g.drawImage(arrow, arrowX, arrowY, null);
341
				g.drawImage(arrow, arrowX, arrowY, null);



327
			}
342
			}



328
			else if (beatTheGame) {
343
			else if (beatTheGame) {



344
				mainLoop = null;



329
				g.drawImage(menuImageBeat, 0, 0, null);
345
				g.drawImage(menuImageBeat, 0, 0, null);



330
			}
346
			}



331
			else if (gameOver) {
347
			else if (gameOver) {



348
				mainLoop = null;



332
				g.drawImage(menuImageGameOver, 0, 0, null);
349
				g.drawImage(menuImageGameOver, 0, 0, null);



350
				deadSnd.stop();



333
			}
351
			}



334
			
352
			



335
		}
353
		}


...
...
503
				arrowY = ARROWY1;
521
				arrowY = ARROWY1;



504
				repaint();
522
				repaint();



505
			}
523
			}



524
			else if ((gameOver && !gameStarted) || beatTheGame){



525
				gameOver = false;



526
				gameStarted = false;



527
				startEverythingOver();



528
			}



506
		}
529
		}



507
		else if (e.getKeyCode() == KeyEvent.VK_F12) {
530
		else if (e.getKeyCode() == KeyEvent.VK_F12) {



508
			nextLevel();
531
			nextLevel();





    

    

    

    

    

    

    

    

    

    

    

          

  Updated
Project Folder/levels/level2.txt  Download diff




      
      
8283
6
#                            #
6
#                            #



7
#                            #
7
#                            #



8
#                            #
8
#                            #



9
#                            #



10
#   *   *  *  *  *  *   *    #
9
#   *   *  *  *  *  *   *    #



11
#  o                      D  #
10
#  o                      D  #



12
#                 w          #
11
#                 w          #


...
...
24
#                            #
23
#                            #



25
#            ######          #
24
#            ######          #



26
########                     #
25
########                     #



27
#                w           #



28
#                            #
26
#                            #



27
#                            #



28
##############################



29
##############################
29
##############################





          

  Updated
Project Folder/levels/level3.txt  Download diff




      
      
8283
9
#                            #
9
#                            #



10
#                            #
10
#                            #



11
#                            #
11
#                            #



12
#                 w          #



13
#                            #
12
#                            #



14
##############################
13
##############################



15
#              * *           #
14
#              * *           #


...
...
17
#D                           #
16
#D                           #



18
#       * *      x      * *  #
17
#       * *      x      * *  #



19
#              p#p#          #
18
#              p#p#          #



20
#00                          #
19
#000                         #



21
#       ^    * * *           #
20
#       ^    * * *           #



22
#* * *  0000            #p#p #
21
#* * *  0000            #p#p #



23
#                            #
22
#                            #


...
...
26
##p#p#p#                     #
25
##p#p#p#                     #



27
#                w        o  #
26
#                w        o  #



28
#        ^                   #
27
#        ^                   #



28
##############################



29
##############################
29
##############################





          


  Added
Project Folder/levels/level5.txt  






  
    

      

        
          
                Show contents
                 
      

      
    

  






          


  Added
Project Folder/levels/level6.txt  






  
    

      

        
          
                Show contents