a

DeDanny · Apr 29, 2010 · fbdb2b8 · fbdb2b8
1 parent 18cae53
commit fbdb2b8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/mario/Stages/Stage.java b/mario/Stages/Stage.java
@@ -32,7 +32,7 @@ public class Stage
     private ArrayList<StageObject> mapObjects = new ArrayList<StageObject>();
     private boolean resetMap = true;
     private long fireBallTimer = System.currentTimeMillis();
-    private int fireBallTime = 500;
+    private int fireBallTime = 700;
 
     public Stage(MarioWorld marioWorld)
     {

diff --git a/mario/Stages/StageMario.java b/mario/Stages/StageMario.java
@@ -87,8 +87,13 @@ public void doLoopAction()
                 {
                     if (jump || jumpExtra)
                     {
+                        if(this.jumpExtra == false){
+                            stage.getSound().playSound("/sound/jump.wav");
+                        }
                         if (this.state != fallMario || jumpExtra)
                         {
+
+
                             setState(jumpMario);
                             this.jumpExtra = false;
                             // //System.out.println("jumpMario");
@@ -238,7 +243,7 @@ public void setUp(boolean up)
     public void setJump(boolean jump)
     {
         this.jump = jump;
-        stage.getSound().playSound("/sound/jump.wav");
+
     }
 
     public void setDown(boolean down)

diff --git a/mario/Stages/goombaGarden/GoombaGardenStart.java b/mario/Stages/goombaGarden/GoombaGardenStart.java
@@ -23,7 +23,7 @@
 public class GoombaGardenStart extends Map {
 
     public GoombaGardenStart(MarioWorld marioWorld) {
-        super(marioWorld, Theme.JUNGLE, new Color(102, 133, 6));
+        super(marioWorld, Theme.JUNGLE, new Color(102, 133, 6), "/sound/background/Athletic.wav");
 
 
     }
@@ -118,7 +118,10 @@ private void putObjects() {
 
         map.put(12 * 135, new StageChoose[]{StageChoose.GROUNDLEFT, StageChoose.CLOUD});
         map.put(12 * 136, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
-        map.put(12 * 140, new StageChoose[]{StageChoose.GROUNDRIGHT});
+        map.put(12 * 140, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
+        map.put(12 * 144, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
+        map.put(12 * 148, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
+        //map.put(12 * 140, new StageChoose[]{StageChoose.GROUNDRIGHT});
         map.put(12 * 137, new StageChoose[]{StageChoose.END});
         map.put(12 * 140, new StageChoose[]{StageChoose.NEXTMAP});
 

diff --git a/mario/Stages/waterfall/WaterFallStart.java b/mario/Stages/waterfall/WaterFallStart.java
@@ -23,7 +23,7 @@ public class WaterFallStart extends Map
 {
     public WaterFallStart(MarioWorld marioWorld)
     {
-        super(marioWorld, Theme.SNOW, new Color(137, 136, 122));
+        super(marioWorld, Theme.SNOW, new Color(137, 136, 122), "/sound/background/Swimming.wav");
     }
 
     @Override
@@ -119,7 +119,9 @@ private void putObjects() {
 
         map.put(12 * 135, new StageChoose[]{StageChoose.GROUNDLEFT, StageChoose.CLOUD});
         map.put(12 * 136, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
-        map.put(12 * 140, new StageChoose[]{StageChoose.GROUNDRIGHT});
+        map.put(12 * 140, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
+        map.put(12 * 144, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
+        map.put(12 * 148, new StageChoose[]{StageChoose.GROUNDMIDDLE, StageChoose.SMALLMUSSCHROOM});
         map.put(12 * 137, new StageChoose[]{StageChoose.END});
         map.put(12 * 140, new StageChoose[]{StageChoose.NEXTMAP});
 

diff --git a/mario/enemy/Goomba.java b/mario/enemy/Goomba.java
@@ -136,6 +136,7 @@ public void doCharacterCollision(ArrayList<Collision> collisions, StageObject st
         if (stageObject instanceof Fireball) {
             //setAlive(false);
             doDead();
+             stage.getSound().playSound("/sound/deadGoomba.wav");
 
         }
     }