Added whip sound effect and bubble swap feature.

philliskiragu · Apr 3, 2013 · 7aca216 · 7aca216
1 parent bb51cbb
commit 7aca216
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 54 deletions.
diff --git a/res/raw/whip.ogg b/res/raw/whip.ogg
diff --git a/src/com/efortin/frozenbubble/HighscoreManager.java b/src/com/efortin/frozenbubble/HighscoreManager.java
@@ -67,7 +67,6 @@
 public class HighscoreManager {
 
   private int currentLevel = 0;
-  private int lastLevel    = 0;
   private long startTime   = 0;
   private long pausedTime  = 0;
   private long lastScoreId = -1;
@@ -122,7 +121,6 @@ public void lostLevel() {
 
   public void startLevel(int level) {
     startTime    = System.currentTimeMillis();
-    lastLevel    = currentLevel;
     currentLevel = level;
     pausedTime   = 0;
     // Log.i("FrozenBubble-highscore", "startLevel(" + level + ")");
@@ -160,8 +158,8 @@ public List<HighscoreDO> getHighscore(int level, int limit) {
     return db.selectByLevel(level, limit);
   }
 
-  public int getLastLevel() {
-    return lastLevel;
+  public int getLevel() {
+    return currentLevel;
   }
 
   public long getLastScoreId() {

diff --git a/src/org/jfedor/frozenbubble/FrozenBubble.java b/src/org/jfedor/frozenbubble/FrozenBubble.java
@@ -106,7 +106,8 @@ public class FrozenBubble extends Activity
   public final static int SOUND_HURRY              = 6;
   public final static int SOUND_NEWROOT            = 7;
   public final static int SOUND_NOH                = 8;
-  public final static int NUM_SOUNDS               = 9;
+  public final static int SOUND_WHIP               = 9;
+  public final static int NUM_SOUNDS               = 10;
 
   public final static int GAME_NORMAL              = 0;
   public final static int GAME_COLORBLIND          = 1;

diff --git a/src/org/jfedor/frozenbubble/FrozenGame.java b/src/org/jfedor/frozenbubble/FrozenGame.java
@@ -137,6 +137,7 @@ public class FrozenGame extends GameScreen {
   SoundManager soundManager;
 
   boolean readyToFire;
+  boolean swapPressed;
   boolean endOfGame;
   boolean frozenify;
   int frozenifyX, frozenifyY;
@@ -180,6 +181,7 @@ public FrozenGame(BmpWrap background_arg,
     play_result          = GAME_PLAYING;
     game_result          = GAME_LOST;
     launchBubblePosition = 20;
+    swapPressed          = false;
 
     penguin = new PenguinSprite(penguins_arg, random);
     this.addSprite(penguin);
@@ -215,7 +217,7 @@ public FrozenGame(BmpWrap background_arg,
     }
 
     currentColor = bubbleManager.nextBubbleIndex(random);
-    nextColor = bubbleManager.nextBubbleIndex(random);
+    nextColor    = bubbleManager.nextBubbleIndex(random);
 
     if (FrozenBubble.getMode() == FrozenBubble.GAME_NORMAL) {
       nextBubble = new ImageSprite(new Rect(302, 440, 302 + 32, 440 + 32),
@@ -562,12 +564,14 @@ private void blinkLine(int number)
     }
   }
 
-  public int play(boolean key_left, boolean key_right, boolean key_fire,
+  public int play(boolean key_left, boolean key_right,
+                  boolean key_fire, boolean key_swap,
                   double trackball_dx,
                   boolean touch_fire, double touch_x, double touch_y,
                   boolean ats_touch_fire, double ats_touch_dx)
   {
     boolean ats = FrozenBubble.getAimThenShoot();
+
     if ((ats && ats_touch_fire) || (!ats && touch_fire)) {
       key_fire = true;
     }
@@ -581,11 +585,22 @@ public int play(boolean key_left, boolean key_right, boolean key_fire,
     } else {
       move[HORIZONTAL_MOVE] = 0;
     }
+
     if (key_fire) {
       move[FIRE] = KEY_UP;
     } else {
       move[FIRE] = 0;
     }
+
+    if (key_swap) {
+      if (!swapPressed) {
+        swapNextLaunchBubble();
+        swapPressed = true;
+      }
+    } else {
+      swapPressed = false;
+    }
+
     if (!ats && touch_fire && movingBubble == null) {
       double xx = touch_x - 318;
       double yy = 406 - touch_y;
@@ -657,7 +672,7 @@ public int play(boolean key_left, boolean key_right, boolean key_fire,
           this.addSprite(movingBubble);
 
           currentColor = nextColor;
-          nextColor = bubbleManager.nextBubbleIndex(random);
+          nextColor    = bubbleManager.nextBubbleIndex(random);
 
           if (FrozenBubble.getMode() == FrozenBubble.GAME_NORMAL) {
             nextBubble.changeImage(bubbles[nextColor]);
@@ -848,4 +863,23 @@ public void setPosition(double value) {
     launchBubble.changeDirection((int)launchBubblePosition);
     penguin.updateState(PenguinSprite.STATE_VOID);
   }
+
+  public void swapNextLaunchBubble()
+  {
+    if (currentColor != nextColor)
+    {
+      int tempColor = currentColor;
+      currentColor  = nextColor;
+      nextColor     = tempColor;
+
+      launchBubble.changeColor(currentColor);
+
+      if (FrozenBubble.getMode() == FrozenBubble.GAME_NORMAL)
+        nextBubble.changeImage(bubbles[nextColor]);
+      else
+        nextBubble.changeImage(bubblesBlind[nextColor]);
+
+      soundManager.playSound(FrozenBubble.SOUND_WHIP);
+    }
+  }
 }
diff --git a/src/org/jfedor/frozenbubble/GameScreen.java b/src/org/jfedor/frozenbubble/GameScreen.java
@@ -117,7 +117,8 @@ public void paint(Canvas c, double scale, int dx, int dy) {
   }
 
   public abstract int play(boolean key_left, boolean key_right,
-                           boolean key_fire, double trackball_dx,
+                           boolean key_fire, boolean key_swap,
+                           double trackball_dx,
                            boolean touch_fire,
                            double touch_x, double touch_y,
                            boolean ats_touch_fire, double ats_touch_dx);