speed and score fix

Author: sparkoo

Bugmaze.iml

@@ -11,7 +11,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
     </content>
     <orderEntry type="jdk" jdkName="Android 4.2.2 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />

gen/cz/sparko/Bugmaze/BuildConfig.java

@@ -1,8 +1,8 @@
 /*___Generated_by_IDEA___*/
 
-/** Automatically generated file. DO NOT MODIFY */
 package cz.sparko.Bugmaze;
 
+/* This stub is only used by the IDE. It is NOT the BuildConfig class actually packed into the APK */
 public final class BuildConfig {
-    public final static boolean DEBUG = true;
+  public final static boolean DEBUG = Boolean.parseBoolean(null);
 }

src/cz/sparko/Bugmaze/Character/Character.java

@@ -16,7 +16,7 @@ public abstract class Character extends AnimatedSprite {
     public static final int Z_INDEX = 100;
 
     private float baseSpeed;
-    private float speed = baseSpeed;
+    private float speed;
 
     protected ArrayList<PowerUp> powerUps;
 
@@ -25,6 +25,7 @@ public abstract class Character extends AnimatedSprite {
     public Character(float pX, float pY, ITiledTextureRegion texture, Game game, float speed) {
         super(pX, pY, texture, game.getVertexBufferObjectManager());
         baseSpeed = speed;
+        this.speed = speed;
         this.game = game;
         this.setZIndex(Z_INDEX);
         powerUps = new ArrayList<PowerUp>();

src/cz/sparko/Bugmaze/GameUpdateHandler.java

@@ -38,9 +38,8 @@ public void onUpdate(float pSecondsElapsed) {
             return;
 
         timeCounter += pSecondsElapsed;
-        if (running) {
+        if (running)
             gameManager.increaseTime(pSecondsElapsed);
-        }
 
         if (gameField.isNeedRefreshField() && running) {
             gameManager.countScore();

src/cz/sparko/Bugmaze/Manager/GameManager.java

@@ -243,7 +243,7 @@ public void multiplyScoreBase(int multiplier) {
     }
 
     public void countScore() {
-        increaseScore((int)tmpScore);
+        score += tmpScore;
         tmpScore = 0;
         scoreBase = 0;
         printScore();

src/cz/sparko/Bugmaze/Menu/ArcadeWorldSelection.java

@@ -0,0 +1,20 @@
+package cz.sparko.Bugmaze.Menu;
+
+import cz.sparko.Bugmaze.Activity.Game;
+import org.andengine.entity.scene.menu.MenuScene;
+import org.andengine.entity.scene.menu.item.IMenuItem;
+
+public class ArcadeWorldSelection extends Menu {
+    public ArcadeWorldSelection(Game game) {
+        super(game);
+    }
+
+    @Override
+    protected void createCustomItems() {
+    }
+
+    @Override
+    public boolean onMenuItemClicked(MenuScene pMenuScene, IMenuItem pMenuItem, float pMenuItemLocalX, float pMenuItemLocalY) {
+        return false;
+    }
+}

src/cz/sparko/Bugmaze/Menu/Menu.java

@@ -1,7 +1,6 @@
 package cz.sparko.Bugmaze.Menu;
 
 import cz.sparko.Bugmaze.Activity.Game;
-import cz.sparko.Bugmaze.Manager.Manager;
 import cz.sparko.Bugmaze.Manager.MenuManager;
 import cz.sparko.Bugmaze.Resource.MenuGeneralTextureResource;
 import cz.sparko.Bugmaze.Resource.ResourceHandler;
@@ -52,12 +51,14 @@ public static Menu menuFactory(MenuEnum menu, Game game) {
                 return new Play(game);
             case OPTIONS:
                 return new Options(game);
+            case ARCADE_WORLD_SELECTION:
+                return new ArcadeWorldSelection(game);
             default:
                 return new Main(game);
         }
     }
 
-    private void createMenuScene() {
+    protected void createMenuScene() {
         menuScene = new MenuScene(game.getCamera());
         menuScene.setBackgroundEnabled(false);
 
@@ -89,11 +90,11 @@ private void createMenuScene() {
         menuScene.setOnMenuItemClickListener(this);
     }
 
-    public MenuScene getMenuScene() {
+    public final MenuScene getMenuScene() {
         return getMenuScene(false);
     }
 
-    public MenuScene getMenuScene(boolean forceLoad) {
+    public final MenuScene getMenuScene(boolean forceLoad) {
         if (forceLoad || menuScene == null) {
             setItems();
             createMenuScene();

src/cz/sparko/Bugmaze/Menu/MenuEnum.java

@@ -3,7 +3,8 @@
 public enum MenuEnum {
     MAIN(0),
     PLAY(1),
-    OPTIONS(2);
+    OPTIONS(2),
+    ARCADE_WORLD_SELECTION(3);
 
     private final int value;
 

src/cz/sparko/Bugmaze/Menu/Play.java

@@ -27,7 +27,7 @@ public boolean onMenuItemClicked(MenuScene pMenuScene, IMenuItem pMenuItem, floa
                 GameManager.getInstance().startGame(new Endless(game));
                 break;
             case 1:
-                //TODO: show some message comming soon ...
+                goToMenu(this, Menu.menuFactory(MenuEnum.ARCADE_WORLD_SELECTION, game));
                 break;
         }
         return false;