Commit: 78d150c45b49c188d6b72f2e84976a79b5fe7562 - SpaceRocket (hg)

Commit MetaInfo

• Revision: 78d150c45b49c188d6b72f2e84976a79b5fe7562 (tree)
• Time: 2022-01-26 01:42:38
• Author: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Removed ship movement settings.

Change Summary

• modified: core/src/com/headwayent/spacerocket/InGameInputProcessor.java
• modified: core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
• modified: core/src/com/headwayent/spacerocket/old/GraphicsManager.java
• modified: core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java
• modified: ios/robovm.properties

Incremental Difference

diff -r e42a2d32b41d -r 78d150c45b49 core/src/com/headwayent/spacerocket/InGameInputProcessor.java
--- a/core/src/com/headwayent/spacerocket/InGameInputProcessor.java	Sun Jan 23 17:06:22 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/InGameInputProcessor.java	Tue Jan 25 18:42:38 2022 +0200
@@ -24,6 +24,14 @@
     private float yTopArrows;
     private float yBottomArrows;
 
+    public void reset() {
+        firePointer = -1;
+        arrowsPointer = -1;
+        fireSet = false;
+        firePressed = false;
+        arrowsPressed = false;
+    }
+
     @Override
     public boolean keyDown(int keycode) {
 //        ExtendedCanvas sc = game.getCanvas();

diff -r e42a2d32b41d -r 78d150c45b49 core/src/com/headwayent/spacerocket/OptionsMenuActivity.java
--- a/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Sun Jan 23 17:06:22 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/OptionsMenuActivity.java	Tue Jan 25 18:42:38 2022 +0200
@@ -103,9 +103,9 @@
 		table.row().pad(10, 0, 10, 0);
 		table.add(vibrationLabel).left();
 		table.add(vibrationCheckbox);
-		table.row().pad(10, 0, 10, 0);
-		table.add(shipMovementLabel).left();
-		table.add(shipMovementSelectBox);
+//		table.row().pad(10, 0, 10, 0);
+//		table.add(shipMovementLabel).left();
+//		table.add(shipMovementSelectBox);
 		table.row().pad(10, 0, 10, 0);
 		table.add(backButton).colspan(2).fillX().uniformX();
 

diff -r e42a2d32b41d -r 78d150c45b49 core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Sun Jan 23 17:06:22 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Tue Jan 25 18:42:38 2022 +0200
@@ -48,7 +48,7 @@
     public static final float ACCELEROMETER_ERROR = 3.0f;
 	public static final float FLOAT_EPSILON = 0.00001f;
     private static final float CORNER_X = 0, CORNER_Y = 0;
-    public static final int NUM_LIVES = 10;
+    public static final int NUM_LIVES = 1;
     private static final int HIDDEN_KEY_NUM_PRESSES = 10;
     public static final int FULL_ACCESS_SCORE = SpaceRocket.DEBUG ? 10 : 150;
     private static float FONT_HEIGHT;
@@ -166,6 +166,10 @@
 	public void setGameOver() {
 		getStatus().setGameOver(true);
         gameOver = false;
+        getStatus().setFirstTime(true);
+        InGameInputProcessor inputProcessor = (InGameInputProcessor) Gdx.input.getInputProcessor();
+        inputProcessor.reset();
+
 //        getGameEngine().pauseApp();
     }
 
@@ -412,7 +416,7 @@
             	showFireToast = false;
             }
             checkFirePressed.set(true);
-            if ((keyState & FIRE_PRESSED) != 0) {
+//            if ((keyState & FIRE_PRESSED) != 0) {
                 getStatus().setFirstTime(false);
                 if(!gameLoaded) {
                     this.reset();
@@ -423,7 +427,7 @@
                 if (inputProcessor.isFireSet()) {
                 	recordKeyReleased(FIRE);
                 }
-            }
+//            }
             return;
         }
 

diff -r e42a2d32b41d -r 78d150c45b49 core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Sun Jan 23 17:06:22 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Tue Jan 25 18:42:38 2022 +0200
@@ -674,8 +674,6 @@
         //    remove(planetSprite[i]);
         }
 
-
-
         append(spaceRocket);
         spaceRocket.setVisible(true);
         if (SpaceRocket.getGame().getGameMode() == SpaceRocket.GameMode.MP) {
@@ -876,6 +874,13 @@
             if (spaceCanvas.getStatus().getLivesRemaining() == 0) {
 
                 spaceRocket.setVisible(false);
+                if (otherSpaceRocket != null) {
+                    otherSpaceRocket.setVisible(false);
+                }
+                remove(spaceRocket);
+                if (otherSpaceRocket != null) {
+                    remove(otherSpaceRocket);
+                }
             }
             if (isMP) {
                 spaceRocket.LifeLost();

diff -r e42a2d32b41d -r 78d150c45b49 core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java
--- a/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Sun Jan 23 17:06:22 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Tue Jan 25 18:42:38 2022 +0200
@@ -140,6 +140,9 @@
     }
 
     public boolean collisionCheck(ExtendedSprite s) {
+        if (!isVisible()) {
+            return false;
+        }
         boolean ret = false;
         if (s == null) {
             System.out.println("SpaceRocketSprite s == null");
@@ -203,7 +206,9 @@
     public void reset() {
         super.reset();
         this.setPosition(initialXPos, initialYPos);
-        this.setVisible(true);
+        if (SpaceRocket.getGame().getCanvas().getStatus().getLivesRemaining() > 0) {
+            this.setVisible(true);
+        }
         speedX = 0;
         speedY = 0;
         currentDelay = 0;
@@ -467,7 +472,7 @@
             }
         }
         if ((speedX != 0.0f) || (speedY != 0.0f)) {
-            System.out.println("left: " + left + " up: " + up + " speedX: " + speedX + " speedY: " + speedY);
+//            System.out.println("left: " + left + " up: " + up + " speedX: " + speedX + " speedY: " + speedY);
             move(speedX, speedY);
         }
         if (invalidateSpeed.get()) {

diff -r e42a2d32b41d -r 78d150c45b49 ios/robovm.properties
--- a/ios/robovm.properties	Sun Jan 23 17:06:22 2022 +0200
+++ b/ios/robovm.properties	Tue Jan 25 18:42:38 2022 +0200
@@ -2,5 +2,5 @@
 app.id=com.headwayent.spacerocket
 app.mainclass=com.headwayent.spacerocket.IOSLauncher
 app.executable=IOSLauncher
-app.build=14
+app.build=15
 app.name=Hotshot 2D