1.0.4a, repeating screen fix, scaled back bonuses, completed color sc…

…heme changes for high levels

app/build.gradle

@@ -8,8 +8,8 @@ android {
  applicationId "com.bulsy.wbtempest"
  minSdkVersion 11
  targetSdkVersion 21
- versionCode 5
- versionName "1.0.3"
+ versionCode 7
+ versionName "1.0.4a"
  }
  buildTypes {
  release {

app/src/main/java/com/bulsy/wbtempest/Board.java

@@ -67,7 +67,7 @@ else if (levnum < FIRST_SPIKE_LEVEL*2)
 
  // if we run out of screens....cycle
  int screennum = (levnum-1) % NUMSCREENS;
- screennum=7;
+ //screennum=7;
 
  switch (screennum) {
  case 0: // circle
@@ -390,7 +390,7 @@ public List<Column> getColumns(){
  }
 
  public int getBoardColor(){
- switch (levnum/NUMSCREENS) {
+ switch ((levnum-1)/NUMSCREENS) {
  case 0:
  return Color.BLUE;
  case 1:
@@ -407,7 +407,7 @@ public int getBoardColor(){
  }
 
  public int getCrawlerColor(){
- switch (levnum/NUMSCREENS) {
+ switch ((levnum-1)/NUMSCREENS) {
  case 0:
  return Color.YELLOW;
  case 1:
@@ -423,6 +423,57 @@ public int getCrawlerColor(){
  }
  }
 
+ public int getExColor(){
+ switch ((levnum-1)/NUMSCREENS) {
+ case 0:
+ return Color.RED;
+ case 1:
+ return Color.MAGENTA;
+ case 2:
+ return Color.GREEN;
+ case 3:
+ return Color.GREEN;
+ case 4:
+ return Color.RED;
+ default:
+ return Color.YELLOW;
+ }
+ }
+
+ public int getExPodColor(){
+ switch ((levnum-1)/NUMSCREENS) {
+ case 0:
+ return Color.MAGENTA;
+ case 1:
+ return Color.BLUE;
+ case 2:
+ return Color.CYAN;
+ case 3:
+ return Color.MAGENTA;
+ case 4:
+ return Color.MAGENTA;
+ default:
+ return Color.MAGENTA;
+ }
+ }
+
+ public int getSpikeColor(){
+ switch ((levnum-1)/NUMSCREENS) {
+ case 0:
+ return Color.GREEN;
+ case 1:
+ return Color.CYAN;
+ case 2:
+ return Color.RED;
+ case 3:
+ return Color.RED;
+ case 4:
+ return Color.GREEN;
+ default:
+ return Color.BLUE;
+ }
+ }
+
  //public int getZPull_X() {
  // return zpull_x;
  //}

app/src/main/java/com/bulsy/wbtempest/Ex.java

@@ -20,7 +20,7 @@ public class Ex {
  static int HEIGHT = 20;
  static int SCOREVAL=150;
  static int PODSCOREVAL=50;
- static int PODSIZE = 35;
+ static int PODSIZE = 38;
  private static int EXHEIGHT_H = HEIGHT/2; // half the height of an Ex
  private static Random rnd = new Random(new java.util.Date().getTime());
 

app/src/main/java/com/bulsy/wbtempest/Missile.java

@@ -12,7 +12,7 @@
  *
  */
 public class Missile {
- private static final int BASE_SPEED = 500;
+ private static final int BASE_SPEED = 540;
  static final int HEIGHT = 8;
  private static final int HEIGHT_H = HEIGHT/2;
  private static final int ENEMY_MISSILE_SPEED_FACTOR = 3;

app/src/main/java/com/bulsy/wbtempest/PlayScreen.java

@@ -39,7 +39,7 @@ public class PlayScreen extends Screen {
  private static final int NUM_STARS = 100; // number of stars when entering a level
  private static final int MAX_VEL = 2500; // spin-controlling at this pace is "fast"
  private static final int INIT_LEVELPREP_POV = Board.BOARD_DEPTH * 2; // start level-intro zoom from this distance
- private static final int PER_LEV_CLEAR_BONUS = 500; // level clear bonus is this *level
+ private static final int PER_LEV_CLEAR_BONUS = 100; // level clear bonus is this *level
  private static final int EXTRA_LIFE_SCORE = 20000; // score at which player gets an extra life
 
  private Crawler crawler;
@@ -507,12 +507,14 @@ else if (zdist < 500)
  }
 
  // draw exes
+ int podc = board.getExPodColor();
+ int exc = board.getExColor();
  for (Ex ex : exes) {
  if (ex.isVisible())
  if (ex.isPod())
- ZMagic.drawObject(c, Color.MAGENTA, ex.getCoords(board), board, boardpov, crawlerzoffset);
+ ZMagic.drawObject(c, podc, ex.getCoords(board), board, boardpov, crawlerzoffset);
  else
- ZMagic.drawObject(c, Color.RED, ex.getCoords(board), board, boardpov, crawlerzoffset);
+ ZMagic.drawObject(c, exc, ex.getCoords(board), board, boardpov, crawlerzoffset);
  else {
  // not visible but still in list means just killed
  ZMagic.drawObject(c, Color.WHITE, ex.getDeathCoords(board), board, boardpov);
@@ -532,15 +534,16 @@ else if (exm.getZPos() > 0){
  }
 
  // draw spikes and spinnythings
+ int spikecol = board.getSpikeColor();
  for (Spike s : spikes) {
  if (s.isVisible()) {
  List<int[]> spikeCoords = s.getCoords(board);
- ZMagic.drawObject(c, Color.GREEN, spikeCoords, board, boardpov);
+ ZMagic.drawObject(c, spikecol, spikeCoords, board, boardpov);
  spikeCoords.set(0, spikeCoords.get(1)); // add white dot at end
  ZMagic.drawObject(c, Color.WHITE, spikeCoords, board, boardpov);
  if (s.isSpinnerVisible()) {
  List<int[]> spinCoords = s.getSpinnerCoords(board);
- ZMagic.drawObject(c, Color.GREEN, spinCoords, board, boardpov);
+ ZMagic.drawObject(c, spikecol, spinCoords, board, boardpov);
  }
  }
  }

notes

@@ -3,16 +3,7 @@ wannabe-tempest for android
 
 
 
----
-1.0.3:
-U level fix
-add level color sequence for advanced levels
-add end of round bonuses
-speedup per lev, xs
-add an extra life every 20000
-
-
-1.0.4:
+1.0.5:
 add crossing-infinity level
 add ability to choose start level if unlocked
 
@@ -111,3 +102,17 @@ for 1.0.2:
 * fix game restart bug.
 * fix text/font size: score, and high/lives spacing on some devices
 * spin control fix for some devices
+
+---
+1.0.3:
+U level fix
+add level color sequence for advanced levels
+add end of round bonuses
+speedup per lev, xs
+add an extra life every 20000
+
+
+1.0.4/a:
+U repeating fix
+end round bonuses cut down
+adjusted level colors for advanced levels