Commit: 2de887cf0af6e7f316f784cd3386c6695a9daebe - SpaceRocket (hg)

Commit MetaInfo

• Revision: 2de887cf0af6e7f316f784cd3386c6695a9daebe (tree)
• Zeit: 2022-01-26 21:55:03
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Log Message

Updated difficulty progress.

Ändern Zusammenfassung

• modified: core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedSprite.java
• modified: core/src/com/headwayent/spacerocket/old/GraphicsManager.java
• modified: core/src/com/headwayent/spacerocket/old/PowerupSprite.java
• modified: ios/robovm.properties

Diff

diff -r 78d150c45b49 -r 2de887cf0af6 core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Tue Jan 25 18:42:38 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Wed Jan 26 14:55:03 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 = 1;
+    public static final int NUM_LIVES = 5;
     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;

diff -r 78d150c45b49 -r 2de887cf0af6 core/src/com/headwayent/spacerocket/old/ExtendedSprite.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Tue Jan 25 18:42:38 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Wed Jan 26 14:55:03 2022 +0200
@@ -215,6 +215,13 @@
         if (SpaceRocket.getGame().getGameMode() == SpaceRocket.GameMode.SP) {
             if (SpaceRocket.getRandom().nextInt(7) == 0) {
                 PowerupSprite powerupSprite = graphicsManager.getPowerupPool().removeOne();
+//                if (powerupSprite != null && powerupSprite.getType() == 1) {
+//                    // We have an increase lives powerup.
+//                    if (SpaceRocket.getRandom().nextInt(2) == 0) {
+//                        powerupSprite.reset();
+//                        powerupSprite = null;
+//                    }
+//                }
                 if (powerupSprite != null) {
                     float xPos = getX() + (getWidth() * 0.5f) - (powerupSprite.getWidth() * 0.5f);
                     float yPos = getY() + (getHeight() * 0.5f) - (powerupSprite.getHeight() * 0.5f);

diff -r 78d150c45b49 -r 2de887cf0af6 core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Tue Jan 25 18:42:38 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Wed Jan 26 14:55:03 2022 +0200
@@ -17,10 +17,10 @@
 
 public class GraphicsManager extends LayerManager {
 	
-	private static final int POWERUP_RATE = 70;
+	private static final int POWERUP_RATE = 400;
     private static final int MAX_NUM_LIVES = 15;
     private static final int BOSS_ROCKET_LAUNCH_RAND = 25;
-    private static final int ENEMY_RAND_1 = 80;
+    private static final int ENEMY_RAND_1 = 70;
     private static final int ENEMY_RAND_2 = 50;
     private static final int ENEMY_RAND_3 = 20;
     private static final int ENEMY_RAND_4 = 12;
@@ -34,14 +34,14 @@
     private static final int BOSS2_NUM_FRAMES = 3;
     private static final int BOSS3_NUM_FRAMES = 4;
     private static final int BOSS4_NUM_FRAMES = 1;
-    private static final int BOSS1_SCORE = 20;
-    private static final int BOSS2_SCORE = 60;
-    private static final int BOSS3_SCORE = 120;
-    private static final int BOSS4_SCORE = 200;
-    private static final int BOSS1_HEALTH = 20;
-    private static final int BOSS2_HEALTH = 30;
-    private static final int BOSS3_HEALTH = 40;
-    private static final int BOSS4_HEALTH = 60;
+    private static final int BOSS1_SCORE = 30;
+    private static final int BOSS2_SCORE = 80;
+    private static final int BOSS3_SCORE = 200;
+    private static final int BOSS4_SCORE = 500;
+    private static final int BOSS1_HEALTH = 40;
+    private static final int BOSS2_HEALTH = 80;
+    private static final int BOSS3_HEALTH = 100;
+    private static final int BOSS4_HEALTH = 140;
     private static final int GIVE_LIFE_FRAME_NUM = 3;
     private static final int ADVANCE_PLANET_FRAMES = 45;
     private static final int ADVANCE_EARTH_FRAMES = 45;
@@ -1096,6 +1096,16 @@
 
             if ((!isMP) && (rand.nextInt(POWERUP_RATE) == 0)) {
                 PowerupSprite powerupSprite = getPowerupPool().removeOne();
+                if (powerupSprite != null && powerupSprite.getType() == 1) {
+                    // We have an increase lives powerup.
+                    if (SpaceRocket.getRandom().nextInt(2) == 0) {
+                        powerupSprite.reset();
+                        powerupSprite = null;
+                        System.out.println("Reset increment lives powerup");
+                    } else {
+                        System.out.println("Launching increment lives powerup");
+                    }
+                }
                 if (powerupSprite != null) {
                     powerupSprite.launchRandom();
                 }
@@ -1262,10 +1272,10 @@
                 int diffHelp = -1;
                 switch (difficulty) {
                     case EASY:
-                        diffHelp = 200;
+                        diffHelp = 100;
                         break;
                     case MEDIUM:
-                        diffHelp = 100;
+                        diffHelp = 50;
                         break;
                     case HARD:
                         diffHelp = 0;

diff -r 78d150c45b49 -r 2de887cf0af6 core/src/com/headwayent/spacerocket/old/PowerupSprite.java
--- a/core/src/com/headwayent/spacerocket/old/PowerupSprite.java	Tue Jan 25 18:42:38 2022 +0200
+++ b/core/src/com/headwayent/spacerocket/old/PowerupSprite.java	Wed Jan 26 14:55:03 2022 +0200
@@ -49,28 +49,27 @@
         }
     }
 
-    public void launch() {
+    public void launchRandom() {
+        super.launchRandom();
         beginTime = System.currentTimeMillis();
-        Random rand = SpaceRocket.getRandom();
-        int XPos = rand.nextInt((int) this.getRightBound());
-        int YPos = rand.nextInt((int) this.getBottomBound());
-        setPosition(XPos, YPos);
-        this.setSpeed(0, 0);
-        setVisible(true);
-        launchSmoke(0, 0);
+//        Random rand = SpaceRocket.getRandom();
+//        int XPos = rand.nextInt((int) this.getRightBound());
+//        int YPos = rand.nextInt((int) this.getBottomBound());
+//        setPosition(XPos, YPos);
+//        this.setSpeed(0, 0);
+//        setVisible(true);
+//        launchSmoke(0, 0);
     }
 
     public void launch(float xPos, float yPos) {
+        super.launch(xPos, yPos);
         beginTime = System.currentTimeMillis();
-        setPosition(xPos, yPos);
-        this.setSpeed(0, 0);
-        setVisible(true);
         launchSmoke(0, 0);
     }
 
     public void launch(float XPos, float YPos, float xSpeed, float ySpeed) {
+        super.launch(XPos, YPos, xSpeed, ySpeed);
         beginTime = System.currentTimeMillis();
-        super.launch(XPos, YPos, xSpeed, ySpeed);
         launchSmoke(xSpeed, ySpeed);
     }
 
@@ -81,4 +80,8 @@
         }
 
     }
+
+    public int getType() {
+        return type;
+    }
 }

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