Commit: d48be19f15943623d69f190588fb2e163657eb3e - SpaceRocket (hg)

Commit MetaInfo

• Révision: d48be19f15943623d69f190588fb2e163657eb3e (tree)
• l'heure: 2021-12-08 02:30:32
• Auteur: sebastian_bugiu
• Commiter: sebastian_bugiu

Message de Log

Various improvements.

Change Summary

• modified: core/src/com/headwayent/spacerocket/InGameInputProcessor.java
• modified: core/src/com/headwayent/spacerocket/Utility.java
• modified: core/src/com/headwayent/spacerocket/old/BossSprite.java
• modified: core/src/com/headwayent/spacerocket/old/EnemySprite.java
• 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: core/src/com/headwayent/spacerocket/old/RocketSprite.java
• modified: core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java

Modification

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/InGameInputProcessor.java
--- a/core/src/com/headwayent/spacerocket/InGameInputProcessor.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/InGameInputProcessor.java	Tue Dec 07 19:30:32 2021 +0200
@@ -319,6 +319,7 @@
         if (firePointer == pointer) {
             firePointer = -1;
             firePressed = false;
+            game.getCanvas().recordKeyReleased(ExtendedCanvas.FIRE);
         }
         if (arrowsPointer == pointer) {
             arrowsPointer = -1;

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/Utility.java
--- a/core/src/com/headwayent/spacerocket/Utility.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/Utility.java	Tue Dec 07 19:30:32 2021 +0200
@@ -1,5 +1,6 @@
 package com.headwayent.spacerocket;
 
+import com.badlogic.gdx.graphics.g2d.Sprite;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 
 public class Utility {
@@ -42,4 +43,8 @@
     public static long currentTimeMillis() {
         return System.currentTimeMillis();
     }
+
+    public static boolean intersects(Sprite s0, Sprite s1) {
+        return s0.getX() < s1.getX() + s1.getWidth() && s0.getX() + s0.getWidth() > s1.getX() && s0.getY() < s1.getY() + s1.getHeight() && s0.getY() + s0.getHeight() > s1.getY();
+    }
 }

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/BossSprite.java
--- a/core/src/com/headwayent/spacerocket/old/BossSprite.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/BossSprite.java	Tue Dec 07 19:30:32 2021 +0200
@@ -6,9 +6,10 @@
 
 import java.util.Random;
 
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 /**
  *
@@ -20,38 +21,36 @@
     private static final int CHANCE_TO_REVERT_M = 10;
     private static final int CHANCE_TO_CHANGE_H = 30;
     private static final int CHANCE_TO_CHANGE_M = 50;
-    private static final int MINI_BOSS_X_SPEED = 12;
-    private static final int MINI_BOSS_Y_SPEED = 12;
-    private int InitialHealth;
+    private static final int MINI_BOSS_X_SPEED = 6 * 60;
+    private static final int MINI_BOSS_Y_SPEED = 3 * 60;
+    private int initialHealth;
     private int health;
-    private boolean launched = false;
+    private boolean launched;
     private boolean bossDestroyed;
-    private boolean bossDestroyedSP = false;
-    private boolean doubleDamage = false;
+    private boolean bossDestroyedSP;
+    private boolean doubleDamage;
     private int doubleDamageHitsRemaining;
-    private float  speedX, speedY;
     private int chanceToRevert, chanceToChange;
     private boolean noChange;
 
     public BossSprite(TextureRegion textureRegion, String name,
                       int leftBound, int rightBound, int upperBound, int bottomBound,
-                      int frames, int NumHits, Status status) {
-        super(textureRegion, name, leftBound, rightBound, upperBound, bottomBound, frames, status);
-
-
-        InitialHealth = NumHits;
-        health = NumHits;
+                      int frames, int numHits) {
+        super(textureRegion, name, leftBound, rightBound, upperBound, bottomBound, frames);
+        initialHealth = numHits;
+        health = numHits;
+        setIgnoreBoundaries(true); // So we don't get reset by ExtendedSprite.advance().
     }
 
     public void enableDoubleHealth() {
-        InitialHealth <<= 1;
+        initialHealth *= 2;
     }
 
     public boolean collisionCheck(RocketSprite s) {
 
         boolean ret = false;
         try {
-            if (getBoundingRectangle().overlaps(s.getBoundingRectangle())) {
+            if (Utility.intersects(this, s)) {
                 s.reset();
                 if (!doubleDamage) {
                     --health;
@@ -65,8 +64,7 @@
                 }
                 System.out.println("Boss Health " + health);
                 if (health <= 0) {
-                    this.resetExplode();
-                    this.reset();
+                    resetWithExplosion();
                     ret = true;
                     launched = false;
                     synchronized (this) {
@@ -77,7 +75,7 @@
 
             }
         } catch (Exception e) {
-            System.out.println("EnemySprite collision error");
+            e.printStackTrace();
         }
         return ret;
     }
@@ -103,12 +101,7 @@
         doubleDamageHitsRemaining = 0;
         bossDestroyedSP = false;
         launched = false;
-        health = InitialHealth;
-    }
-
-    public void resetExplode() {
-        super.resetExplode();
-        this.reset();
+        health = initialHealth;
     }
 
     public void launchRandom() {
@@ -127,12 +120,7 @@
                 noChange = true;
             }
         }
-        Random rand = SpaceRocket.getRandom();
-        speedX = rand.nextInt(((int) ExtendedCanvas.hSpeed * 2) + 1) - ExtendedCanvas.hSpeed;
-        speedY = rand.nextInt((int) ExtendedCanvas.vSpeed) + (ExtendedCanvas.vSpeed - 1);
-        setSpeed(speedX, speedY);
-        this.setPosition(rand.nextInt((int) (getRightBound() - getLeftBound() - getWidth() + 1)), -getHeight());
-        setVisible(true);
+        super.launchRandom();
         launched = true;
     }
 
@@ -142,8 +130,7 @@
 
     public void changeSpeed() {
         Random rand = SpaceRocket.getRandom();
-        speedX = rand.nextInt(((int) ExtendedCanvas.hSpeed << 1) + 1) - ExtendedCanvas.hSpeed;
-        setSpeed(speedX, speedY);
+        setRandomSpeed();
     }
 
     //false for x true for y
@@ -151,7 +138,8 @@
         Random rand = SpaceRocket.getRandom();
         if(SpaceRocket.getGame().getGameMode() == SpaceRocket.GameMode.SP) {
             if ((!noChange) && (rand.nextInt(chanceToRevert) == 0)) {
-
+                float speedX = getSpeedX();
+                float speedY = getSpeedY();
                 if (b) {
                     speedY = -speedY;
                 } else {
@@ -167,41 +155,54 @@
     public void advance() {
         super.advance();
         Random rand = SpaceRocket.getRandom();
-        ExtendedSprite miniBossSprite = SpaceRocket.getGame().getCanvas().getGraphicsManager().getMiniBossPool().removeOne();
-        if(miniBossSprite != null) {
-            float x = getX();
-            float y = getY();
 
-            if(SpaceRocket.getGame().getGameMode() == SpaceRocket.GameMode.SP) {
-                if ((!noChange) && (rand.nextInt(chanceToChange) == 0)) {
-                    changeSpeed();
-                }
+        float x = getX();
+        float y = getY();
+
+//        System.out.println("boss xPos: " + x + " yPos: " + y);
+
+        if(SpaceRocket.getGame().getGameMode() == SpaceRocket.GameMode.SP) {
+            if ((!noChange) && (rand.nextInt(chanceToChange) == 0)) {
+                changeSpeed();
             }
-            if (x + getWidth() < getLeftBound()) {
-                x = ExtendedCanvas.getScreenWidth();
-                if(!invertSpeed(false)) {
+        }
+        if (x + getWidth() < getLeftBound()) {
+            x = ExtendedCanvas.getScreenWidth();
+            if(!invertSpeed(false)) {
+                ExtendedSprite miniBossSprite = SpaceRocket.getGame().getCanvas().getGraphicsManager().getMiniBossPool().removeOne();
+                if (miniBossSprite != null) {
                     miniBossSprite.launch(0, this.getY(), MINI_BOSS_X_SPEED, 0);
                 }
             }
-            if (x > getRightBound()) {
-                x = -getWidth();
-                if(!invertSpeed(false)) {
+        }
+        if (x > getRightBound()) {
+            x = -getWidth();
+            if(!invertSpeed(false)) {
+                ExtendedSprite miniBossSprite = SpaceRocket.getGame().getCanvas().getGraphicsManager().getMiniBossPool().removeOne();
+                if (miniBossSprite != null) {
                     miniBossSprite.launch(ExtendedCanvas.getScreenWidth(), this.getY(), -MINI_BOSS_X_SPEED, 0);
                 }
             }
-            if (y + getHeight() < getUpperBound()) {
-                y = ExtendedCanvas.getScreenHeight();
-                if(!invertSpeed(true)) {
+        }
+        if (y + getHeight() < getUpperBound()) {
+            y = ExtendedCanvas.getScreenHeight();
+            if(!invertSpeed(true)) {
+                ExtendedSprite miniBossSprite = SpaceRocket.getGame().getCanvas().getGraphicsManager().getMiniBossPool().removeOne();
+                if (miniBossSprite != null) {
                     miniBossSprite.launch(this.getX(), 0, 0, MINI_BOSS_Y_SPEED);
                 }
             }
-            if (y > getBottomBound()) {
-                y = -getHeight();
-                if(!invertSpeed(true)) {
+        }
+        if (y > getBottomBound()) {
+            y = -getHeight();
+            if(!invertSpeed(true)) {
+                ExtendedSprite miniBossSprite = SpaceRocket.getGame().getCanvas().getGraphicsManager().getMiniBossPool().removeOne();
+                if (miniBossSprite != null) {
                     miniBossSprite.launch(this.getX(), ExtendedCanvas.getScreenHeight(), 0, -MINI_BOSS_Y_SPEED);
                 }
             }
         }
+        setPosition(x, y);
     }
 
     public int getHealth() {

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/EnemySprite.java
--- a/core/src/com/headwayent/spacerocket/old/EnemySprite.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/EnemySprite.java	Tue Dec 07 19:30:32 2021 +0200
@@ -2,18 +2,16 @@
 
 import java.util.Random;
 
-import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 public class EnemySprite extends ExtendedSprite {
-    private Status status;
 
     public EnemySprite(TextureRegion textureRegion, String name,
                        int leftBound, int rightBound, int upperBound, int bottomBound,
-                       int Frames, Status status) {
-        super(textureRegion, name, leftBound, rightBound, upperBound, bottomBound, Frames, true);
-        this.status = status;
+                       int frames) {
+        super(textureRegion, name, leftBound, rightBound, upperBound, bottomBound, frames, true);
     }
 
     public boolean collisionCheck(RocketSprite s) {
@@ -22,12 +20,12 @@
             System.out.println("NULL");
         }
         try {
-            if (getBoundingRectangle().overlaps(s.getBoundingRectangle())) {
+            if (Utility.intersects(this, s)) {
                 ret = true;
                 if (!s.isDoubleDamage()) {
                     s.reset();
                 }
-                this.resetExplode();
+                this.resetWithExplosion();
             }
         } catch (Exception e) {
             System.out.println("EnemySprite collision error");
@@ -35,15 +33,6 @@
         return ret;
     }
 
-    public void launch() {
-        Random rand = SpaceRocket.getRandom();
-        float speedX = rand.nextInt(((int)ExtendedCanvas.hSpeed << 1) + 1) - ExtendedCanvas.hSpeed;
-        float speedY = rand.nextInt((int) ExtendedCanvas.vSpeed) + (ExtendedCanvas.vSpeed - 1);
-        setSpeed(speedX, speedY);
-        setPosition(rand.nextInt((int) (getRightBound() - getLeftBound() - getWidth() + 1)), -getHeight());
-        setVisible(true);
-    }
-
     public void launch(EnemyStats s) {
         setSpeed((s.speedX - 5), s.speedY); //Little issue with signed int transfer
         setPosition(s.positionX, s.positionY);

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Tue Dec 07 19:30:32 2021 +0200
@@ -46,11 +46,6 @@
     public static final int GAME_D_PRESSED = 1 << GAME_D;
     public static final float ACCELEROMETER_ERROR = 3.0f;
 	public static final float FLOAT_EPSILON = 0.00001f;
-	public static final float H_SPEED = 4;
-    public static final float H_SPEED_SM = 2;
-    public static final float V_SPEED = 4;
-    public static final float V_SPEED_SM = 2;
-    public static float hSpeed, vSpeed;
     private static final float CORNER_X = 0, CORNER_Y = 0;
     private static final int NUM_LIVES = 10;
     private static final int HIDDEN_KEY_NUM_PRESSES = 10;
@@ -106,10 +101,6 @@
     public void updateDisplayMetrics() {
     	screenWidth = Gdx.graphics.getWidth();
         screenHeight = Gdx.graphics.getHeight();
-        hSpeed = (screenWidth > GraphicsManager.MIN_WIDTH ||
-                screenHeight > GraphicsManager.MIN_HEIGHT) ? H_SPEED : H_SPEED_SM;
-        vSpeed = (screenHeight > GraphicsManager.MIN_HEIGHT ||
-                screenHeight > GraphicsManager.MIN_HEIGHT) ? V_SPEED : V_SPEED_SM;
     }
 
 	public ExtendedCanvas() {

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/ExtendedSprite.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedSprite.java	Tue Dec 07 19:30:32 2021 +0200
@@ -24,6 +24,7 @@
     private String name;
     private ExtendedSpritePool pool;
     private TextureRegion[] animationFrames;
+    private boolean ignoreBoundaries;
     
     public String getName() {
     	return name;
@@ -58,7 +59,7 @@
 
     private void restartAnimation() {
         if (numFrames > 1) {
-            animation = new Animation<>(0.25f, animationFrames);
+            animation = new Animation<>(0.05f, animationFrames);
         }
     }
 
@@ -91,6 +92,9 @@
 
     public void reset() {
 //        System.out.println("Resetting " + name);
+        if (name.contains("miniBossSprite")) {
+            System.out.println();
+        }
         setVisible(false);
         if (animation != null) {
             animationStateTime = 0;
@@ -132,26 +136,26 @@
     }
 
     public void advance() {
-        float x = getX() + speedX;
-        float y = getY() + speedY;
-        if ((x + getWidth() > getLeftBound()) && (x < getRightBound()) &&
-                (y + getHeight() > getUpperBound()) && (y < getBottomBound())) {
+        float x = getX() + speedX * Gdx.graphics.getDeltaTime();
+        float y = getY() + speedY * Gdx.graphics.getDeltaTime();
+        if (ignoreBoundaries || ((x + getWidth() > getLeftBound()) && (x < getRightBound()) &&
+                (y + getHeight() > getUpperBound()) && (y < getBottomBound()))) {
             setPosition(x, y);
             if (numFrames > 1 && !lastFrameReached) {
                 animationStateTime += Gdx.graphics.getDeltaTime();
                 TextureRegion currentFrame = animation.getKeyFrame(animationStateTime, !lastFrameStick);
                 setRegion(currentFrame);
-                for (int i = 0; i < animationFrames.length; ++i) {
-                    if (animationFrames[i] == currentFrame) {
-                        System.out.println(name + " currentFrame: " + i + " animationStateTime: " + animationStateTime);
-                        break;
-                    }
-                }
+//                for (int i = 0; i < animationFrames.length; ++i) {
+//                    if (animationFrames[i] == currentFrame && name.contains("explosion")) {
+//                        System.out.println(name + " currentFrame: " + i + " animationStateTime: " + animationStateTime);
+//                        break;
+//                    }
+//                }
                 TextureRegion[] keyFrames = animation.getKeyFrames();
                 if (currentFrame == keyFrames[keyFrames.length - 1]) {
                     lastFrameReached = true;
                     if (hiddenAfterLastFrame) {
-                        System.out.println("hiddenAfterLastFrame: " + name + " reset");
+//                        System.out.println("hiddenAfterLastFrame: " + name + " reset");
                         reset();
                     }
                 }
@@ -166,16 +170,22 @@
     }
 
     public void launch(float xPos, float yPos, float xSpeed, float ySpeed) {
+//        System.out.println("Launching: " + name + " xPos: " + xPos + " yPos: " + yPos + " xSpeed: " + xSpeed + " ySpeed: " + ySpeed);
         setPosition(xPos, yPos);
         setSpeed(xSpeed, ySpeed);
         setVisible(true);
     }
 
+    public void setRandomSpeed() {
+        Random rand = SpaceRocket.getRandom();
+        setSpeed((rand.nextInt(5 * 12 + 1) - 30), (rand.nextInt(5) + 2) * 60);
+    }
+
     //This is completely wrong for an "abstract" class
     public void launchRandom() {
         Random rand = SpaceRocket.getRandom();
         setPosition(rand.nextInt((int) rightBound), -this.getHeight());
-        setSpeed((rand.nextInt(5) - 2), rand.nextInt(7) + 3);
+        setRandomSpeed();
         setVisible(true);
     }
 
@@ -194,7 +204,7 @@
         this.lastFrameStick = lastFrameStick;
     }
 
-    public void resetExplode() {
+    public void resetWithExplosion() {
         GraphicsManager graphicsManager = SpaceRocket.getGame().getCanvas().getGraphicsManager();
         ExplosionSprite explosionSprite = graphicsManager.getExplosionPool().removeOne();
         if (explosionSprite != null) {
@@ -210,7 +220,7 @@
                 powerupSprite.launch(xPos, yPos, getSpeedX(), getSpeedY());
             }
         }
-        setVisible(false);
+        reset();
     }
 
 	public boolean isAllowOutOfBounds() {
@@ -242,4 +252,12 @@
     public void setPool(ExtendedSpritePool pool) {
         this.pool = pool;
     }
+
+    public boolean isIgnoreBoundaries() {
+        return ignoreBoundaries;
+    }
+
+    public void setIgnoreBoundaries(boolean ignoreBoundaries) {
+        this.ignoreBoundaries = ignoreBoundaries;
+    }
 }

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Tue Dec 07 19:30:32 2021 +0200
@@ -7,6 +7,7 @@
 import com.headwayent.spacerocket.InGameInputProcessor;
 import com.headwayent.spacerocket.Preferences;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 import java.util.Random;
 
@@ -29,7 +30,7 @@
     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 BOSS1_SCORE = 2;
     private static final int BOSS2_SCORE = 60;
     private static final int BOSS3_SCORE = 120;
     private static final int BOSS4_SCORE = 200;
@@ -268,7 +269,7 @@
         int y = 0;
         int width = (int) ExtendedCanvas.getScreenWidth();
         int height = (int) ExtendedCanvas.getScreenHeight();
-        explosion = new ExplosionSprite[16];
+        explosion = new ExplosionSprite[64];
         for (int i = 0; i < explosion.length; ++i) {
             explosion[i] = new ExplosionSprite(explosionRegion, "explosion" + i,
                     x, width, y, height, 8, explodeSnd); //, 34, 33);
@@ -301,7 +302,7 @@
             append(flamesSprite[i]);
             flamesPool.add(flamesSprite[i]);
         }
-        smokeSprite = new SmokeSprite[16];
+        smokeSprite = new SmokeSprite[64];
         for(int i = 0; i < smokeSprite.length; ++i) {
             smokeSprite[i] = new SmokeSprite(smokeRegion, "smokeSprite" + i,
                     x, width, y, height, 12);
@@ -321,7 +322,7 @@
             append(powerupSprite[i]);
             powerupPool.add(powerupSprite[i]);
         }
-        srrocketLeftSprite = new RocketSprite[16];
+        srrocketLeftSprite = new RocketSprite[64];
         for (int i = 0; i < srrocketLeftSprite.length; ++i) {
             srrocketLeftSprite[i] = new RocketSprite(rocketLeftRegion, "srrocketLeftSprite" + i,
                     x, width, y, height, true, 8);
@@ -329,7 +330,7 @@
             append(srrocketLeftSprite[i]);
             rocketLeftPool.add(srrocketLeftSprite[i]);
         }
-        srrocketRightSprite = new RocketSprite[16];
+        srrocketRightSprite = new RocketSprite[64];
         for (int i = 0; i < srrocketRightSprite.length; ++i) {
             srrocketRightSprite[i] = new RocketSprite(rocketRightRegion, "srrocketRightSprite" + i,
                     x, width, y, height, true, 8);
@@ -337,8 +338,8 @@
             append(srrocketRightSprite[i]);
             rocketRightPool.add(srrocketRightSprite[i]);
         }
-        tripleRocketSpriteCenter = new RocketSprite[16];
-        otherTripleRocketSpriteCenter = new RocketSprite[16];
+        tripleRocketSpriteCenter = new RocketSprite[64];
+        otherTripleRocketSpriteCenter = new RocketSprite[64];
         for (int i = 0; i < tripleRocketSpriteCenter.length; ++i) {
             tripleRocketSpriteCenter[i] = new RocketSprite(centerRocketMultiRegion, "tripleRocketSpriteCenter" + i,
                     x, width, y, height, true, 1);
@@ -350,8 +351,8 @@
             append(otherTripleRocketSpriteCenter[i]);
             rocketTripleCenterPool.add(otherTripleRocketSpriteCenter[i]);
         }
-        tripleRocketSpriteLeft = new RocketSprite[16];
-        otherTripleRocketSpriteLeft = new RocketSprite[16];
+        tripleRocketSpriteLeft = new RocketSprite[64];
+        otherTripleRocketSpriteLeft = new RocketSprite[64];
         for (int i = 0; i < tripleRocketSpriteLeft.length; ++i) {
             tripleRocketSpriteLeft[i] = new RocketSprite(leftRocketMultiRegion, "tripleRocketSpriteLeft" + i,
                     x, width, y, height, true, 1);
@@ -362,8 +363,8 @@
             append(otherTripleRocketSpriteLeft[i]);
             rocketTripleLeftPool.add(otherTripleRocketSpriteLeft[i]);
         }
-        tripleRocketSpriteRight = new RocketSprite[16];
-        otherTripleRocketSpriteRight = new RocketSprite[16];
+        tripleRocketSpriteRight = new RocketSprite[64];
+        otherTripleRocketSpriteRight = new RocketSprite[64];
         for (int i = 0; i < tripleRocketSpriteRight.length; ++i) {
             tripleRocketSpriteRight[i] = new RocketSprite(rightRocketMultiRegion, "tripleRocketSpriteRight" + i,
                     x, width, y, height, true, 1);
@@ -374,8 +375,8 @@
             append(otherTripleRocketSpriteRight[i]);
             rocketTripleRightPool.add(otherTripleRocketSpriteRight[i]);
         }
-        doubleDamageRocketSprite = new RocketSprite[16];
-        otherDoubleDamageRocketSprite = new RocketSprite[16];
+        doubleDamageRocketSprite = new RocketSprite[64];
+        otherDoubleDamageRocketSprite = new RocketSprite[64];
         for (int i = 0; i < doubleDamageRocketSprite.length; ++i) {
             doubleDamageRocketSprite[i] = new RocketSprite(doubleDamageRocketRegion, "doubleDamageRocketSprite" + i,
                     x, width, y, height, true, 4);
@@ -388,7 +389,7 @@
             append(otherDoubleDamageRocketSprite[i]);
             rocketDoubleDamagePool.add(otherDoubleDamageRocketSprite[i]);
         }
-        enemyrocketSprite = new RocketSprite[16];
+        enemyrocketSprite = new RocketSprite[64];
         for (int i = 0; i < enemyrocketSprite.length; ++i) {
             numFrames = 0;
             int r = SpaceRocket.getRandom().nextInt(4);
@@ -410,26 +411,23 @@
                     break;
             }
             enemyrocketSprite[i] =
-                    new RocketSprite(enemyRocketRegion[r], "enemyrocketSprite" + i,
+                    new RocketSprite(enemyRocketRegion[r], "enemyRocketSprite" + i,
                             x, width, y, height, false, numFrames);
             append(enemyrocketSprite[i]);
             rocketEnemyPool.add(enemyrocketSprite[i]);
         }
 
         bossSprite = new BossSprite[4];
-        bossSprite[0] = new BossSprite(boss0Region, "boss0", x, width, y, height, BOSS1_NUM_FRAMES, BOSS1_HEALTH, status);
-        append(bossSprite[0]);
-        bossSprite[1] = new BossSprite(boss1Region, "boss1", x, width, y, height, BOSS2_NUM_FRAMES, BOSS2_HEALTH, status);
-        append(bossSprite[1]);
-        bossSprite[2] = new BossSprite(boss2Region, "boss2", x, width, y, height, BOSS3_NUM_FRAMES, BOSS3_HEALTH, status);
-        append(bossSprite[2]);
-        bossSprite[3] = new BossSprite(boss3Region, "boss3", x, width, y, height, BOSS4_NUM_FRAMES, BOSS4_HEALTH, status);
-        append(bossSprite[3]);
+        bossSprite[0] = new BossSprite(boss0Region, "boss0", x, width, y, height, BOSS1_NUM_FRAMES, BOSS1_HEALTH);
+        bossSprite[1] = new BossSprite(boss1Region, "boss1", x, width, y, height, BOSS2_NUM_FRAMES, BOSS2_HEALTH);
+        bossSprite[2] = new BossSprite(boss2Region, "boss2", x, width, y, height, BOSS3_NUM_FRAMES, BOSS3_HEALTH);
+        bossSprite[3] = new BossSprite(boss3Region, "boss3", x, width, y, height, BOSS4_NUM_FRAMES, BOSS4_HEALTH);
         for (BossSprite s : bossSprite) {
+            append(s);
             bossPool.add(s);
         }
 
-        enemy = new EnemySprite[8];
+        enemy = new EnemySprite[64];
         for (int i = 0; i < enemy.length; ++i) {
             int r = SpaceRocket.getRandom().nextInt(4);
             if (r == 0) {
@@ -437,12 +435,12 @@
             } else {
                 numFrames = 1;
             }
-            enemy[i] = new EnemySprite(enemyRegion[r], "enemy" + i, x, width, y, height, numFrames, status);
+            enemy[i] = new EnemySprite(enemyRegion[r], "enemy" + i, x, width, y, height, numFrames);
             append(enemy[i]);
             enemyPool.add(enemy[i]);
         }
             
-        otherRocketLeftSprite = new RocketSprite[16];
+        otherRocketLeftSprite = new RocketSprite[64];
         for (int i = 0; i < otherRocketLeftSprite.length; ++i) {
             otherRocketLeftSprite[i] = new RocketSprite(
                     rocketLeftRegion, "otherRocketLeftSprite" + i,
@@ -451,7 +449,7 @@
             append(otherRocketLeftSprite[i]);
             rocketLeftPool.add(otherRocketLeftSprite[i]);
         }
-        otherRocketRightSprite = new RocketSprite[16];
+        otherRocketRightSprite = new RocketSprite[64];
         for (int i = 0; i < otherRocketRightSprite.length; ++i) {
             otherRocketRightSprite[i] = new RocketSprite(
                     rocketRightRegion, "otherRocketRightSprite" + i,
@@ -463,7 +461,7 @@
         miniBossSprite = new ExtendedSprite[4];
         for (int i = 0; i < miniBossSprite.length; ++i) {
             miniBossSprite[i] = new ExtendedSprite(miniBossRegion[i], "miniBossSprite" + i,
-                    x, width, y, height, 3);
+                    x, width, y, height, 3, true);
             miniBossSprite[i].setVisible(false);
 //            bossSprite[i].setMiniBossSprite(miniBossSprite[i]);
             append(miniBossSprite[i]);
@@ -486,7 +484,7 @@
         append(atmosphereSprite);
 
 
-        starSprite = new ExtendedSprite[32];
+        starSprite = new ExtendedSprite[128];
         for (int i = 0; i < starSprite.length; ++i) {
             starSprite[i] = new ExtendedSprite(starRegion, "starSprite" + i,
                     x, width, y, height, 1);
@@ -865,7 +863,7 @@
             Status status = spaceCanvas.getStatus();
             if (!spaceCanvas.getStatus().firstTime && spaceCanvas.getStatus().livesRemaining != 0) {
                 spaceRocket.advance(XDir, YDir, shoot);
-                if (spaceRocket.getBoundingRectangle().overlaps(fireSprite.getBoundingRectangle())) {
+                if (Utility.intersects(spaceRocket, fireSprite)) {
                     fireSprite.setRegion(touchFireTransRegion);
                     fireSpriteTransparent = true;
                 } else if (fireSpriteTransparent) {
@@ -890,9 +888,9 @@
             if (showEarth) {
                 showEarth = false;
                 earthSprite.launch((ExtendedCanvas.getScreenWidth() * 0.5f) - (earthSprite.getWidth() * 0.5f),
-                        ExtendedCanvas.getScreenHeight() - earthSprite.getHeight(), 0, 1);
+                        ExtendedCanvas.getScreenHeight() - earthSprite.getHeight(), 0, 1 * 60 * Gdx.graphics.getDeltaTime());
                 atmosphereSprite.launch((ExtendedCanvas.getScreenWidth() * 0.5f) - (atmosphereSprite.getWidth() * 0.5f),
-                        ExtendedCanvas.getScreenHeight() - atmosphereSprite.getHeight(), 0, 1);
+                        ExtendedCanvas.getScreenHeight() - atmosphereSprite.getHeight(), 0, 1 * 60 * Gdx.graphics.getDeltaTime());
             }
             if (atmosphereSprite.getX() > 0) {
             	atmosphereSprite.setVisible(false);
@@ -910,9 +908,9 @@
             }
             if (rand.nextInt(10) == 0) {
                 for (int i = 0; i < starSprite.length; ++i) {
-                    if (!starSprite[i].isVisible()) {
-                        starSprite[i].launchRandom();
-                        break;
+                    ExtendedSprite starSprite = getStarPool().removeOne();
+                    if (starSprite != null) {
+                        starSprite.launchRandom();
                     }
                 }
             }
@@ -998,7 +996,7 @@
             if ((isMP) && (connectionThread != null) && (connectionThread.getBossDestroyedByCoop())) {
                 int killedBoss = connectionThread.getKilledBoss();
                 if ((killedBoss >= 0) && (killedBoss < BOSS_COUNT) && (lastKilledBoss != killedBoss)) {
-                    bossSprite[killedBoss].resetExplode();
+                    bossSprite[killedBoss].resetWithExplosion();
                     System.out.println("Boss: " + killedBoss + " has been killed");
                     lastKilledBoss = killedBoss;
                 } else {
@@ -1248,45 +1246,41 @@
                         enemyRand = ENEMY_RAND_FINAL + diffHelp;
                 }
                 if ((enemyRand > 0) && (rand.nextInt(enemyRand) == 0)) {
-                    for (int i = 0; i < enemy.length; ++i) {
-                        if (!enemy[i].isVisible()) {
-                            enemy[i].launchRandom();
-                            break;
-                        }
+                    EnemySprite enemySprite = getEnemyPool().removeOne();
+                    if (enemySprite != null) {
+                        enemySprite.launchRandom();
                     }
                 }
             } else {
                 if ((connectionThread != null) && (connectionThread.getRocketLaunched())) {
-                    for (int i = 0; i < enemy.length; ++i) {
-                        if (!enemy[i].isVisible()) {
-                            enemy[i].launch(connectionThread.getRocketXPos(),
-                                    connectionThread.getRocketXSpeed(),
-                                    connectionThread.getRocketYSpeed());
-                            break;
-                        }
+                    EnemySprite enemySprite = getEnemyPool().removeOne();
+                    if (enemySprite != null) {
+                        enemySprite.launch(connectionThread.getRocketXPos(),
+                                connectionThread.getRocketXSpeed(),
+                                connectionThread.getRocketYSpeed());
                     }
                 }
             }
 
             if (isMP) {
                 if ((connectionThread != null) && (connectionThread.getBossLaunched())) {
-                    int BossNum = connectionThread.GetBossNum();
-                    if ((BossNum >= 0) && (BossNum < BOSS_COUNT)) {
-                        if (currentBoss != BossNum) {
-                            bossSprite[BossNum].launch(connectionThread.getBossXPos(),
+                    int bossNum = connectionThread.GetBossNum();
+                    if ((bossNum >= 0) && (bossNum < BOSS_COUNT)) {
+                        if (currentBoss != bossNum) {
+                            bossSprite[bossNum].launch(connectionThread.getBossXPos(),
                                     connectionThread.getBossXSpeed(),
                                     connectionThread.getBossYSpeed());
-                            bossSprite[BossNum].enableDoubleHealth();
+                            bossSprite[bossNum].enableDoubleHealth();
                             if (Preferences.getInstance().isSoundEnabled()) {
                                 Gdx.input.vibrate(500);
                             }
-                            System.out.println("Boss: " + BossNum + " has been launched");
+                            System.out.println("Boss: " + bossNum + " has been launched");
                             synchronized (this) {
-                                currentBoss = BossNum;
+                                currentBoss = bossNum;
                             }
                         }
                     } else {
-                        System.out.println("Wrong bossnum: " + BossNum);
+                        System.out.println("Wrong bossnum: " + bossNum);
                     }
                 }
             }
@@ -1524,7 +1518,7 @@
             for (int i = 0; i < miniBossSprite.length; ++i) {
                 if (miniBossSprite[i].isVisible()) {
                     miniBossSprite[i].advance();
-                    break;
+//                    break;
                 }
             }
 

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/PowerupSprite.java
--- a/core/src/com/headwayent/spacerocket/old/PowerupSprite.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/PowerupSprite.java	Tue Dec 07 19:30:32 2021 +0200
@@ -9,6 +9,7 @@
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 /**
  *
@@ -30,7 +31,7 @@
     public int collisionCheck(SpaceRocketSprite s) {
         int type = 0;
         try {
-            if(this.getBoundingRectangle().overlaps(s.getBoundingRectangle())) {
+            if(Utility.intersects(this, s)) {
                 type = this.type;
                 this.reset();
             }

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/RocketSprite.java
--- a/core/src/com/headwayent/spacerocket/old/RocketSprite.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/RocketSprite.java	Tue Dec 07 19:30:32 2021 +0200
@@ -5,15 +5,16 @@
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.headwayent.spacerocket.SpaceRocket;
+import com.headwayent.spacerocket.Utility;
 
 public class RocketSprite extends ExtendedSprite {
 
     private boolean upDirection;
     private boolean doubleDamage;
-    public static final int _SR_SPEED = -12;
-    public static final int _SR_SPEED_SM = -7;
-    public static final int _ENEMY_SPEED = 8;
-    public static final int _ENEMY_SPEED_SM = 4;
+    public static final int _SR_SPEED = -10 * 60;
+    public static final int _SR_SPEED_SM = -4 * 60;
+    public static final int _ENEMY_SPEED = 6 * 60;
+    public static final int _ENEMY_SPEED_SM = 2 * 60;
     public static int SR_SPEED;
     public static int ENEMY_SPEED;
 
@@ -36,7 +37,7 @@
             System.out.println("RocketSprite s == null");
         }
         try {
-            if (getBoundingRectangle().overlaps(s.getBoundingRectangle())) {
+            if (Utility.intersects(this, s)) {
                 ret = true;
                 s.reset();
                 if (!doubleDamage) {
@@ -44,7 +45,7 @@
                 }
             }
         } catch (Exception e) {
-            System.out.println("SpaceRocketSprite collision error");
+            e.printStackTrace();
         }
         return ret;
     }
@@ -58,7 +59,7 @@
         if (upDirection) {
             speedY = SR_SPEED;
         } else {
-            speedY = SpaceRocket.getRandom().nextInt(ENEMY_SPEED) + (ENEMY_SPEED >> 2);
+            speedY = SpaceRocket.getRandom().nextInt(ENEMY_SPEED) + (ENEMY_SPEED / 4);
         }
         setSpeed(0, speedY);
 //		released = true;
@@ -75,20 +76,11 @@
         return upDirection;
     }
 
-    /**
-     * @return the doubleDamage
-     */
     public boolean isDoubleDamage() {
         return doubleDamage;
     }
 
-    /**
-     * @param doubleDamage the doubleDamage to set
-     */
     public void setDoubleDamage(boolean doubleDamage) {
         this.doubleDamage = doubleDamage;
     }
-    /*	public void advance() {
-    move(speedX, speedY);
-    }*/
 }

diff -r fe59f8dfa109 -r d48be19f1594 core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java
--- a/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Sun Dec 05 20:50:17 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/SpaceRocketSprite.java	Tue Dec 07 19:30:32 2021 +0200
@@ -19,19 +19,19 @@
     public static int SR_ACC_SPEED;
     public static int SR_MAX_SPEED;
     private static int ROCKET_DISTANCE;
-    public static final int _ACC_SPEED = 2;
-    public static final int _MAX_SPEED = 7;
+    public static final int _ACC_SPEED = 1;
+    public static final int _MAX_SPEED = 5;
     private static final int _ROCKET_DISTANCE = -24;
     public static final int _ACC_SPEED_SM = 1;
-    public static final int _MAX_SPEED_SM = 4;
+    public static final int _MAX_SPEED_SM = 2;
     private static final int _ROCKET_DISTANCE_SM = -10;
     private static final int NUM_LIVES = 10;
     private static int MULTI_SHOOT_X_SPEED;
     private static int MULTI_SHOOT_Y_SPEED;
-    private static final int _MULTI_SHOOT_X_SPEED = 6;
-    private static final int _MULTI_SHOOT_X_SPEED_SM = 3;
-    private static final int _MULTI_SHOOT_Y_SPEED = 13;
-    private static final int _MULTI_SHOOT_Y_SPEED_SM = 7;
+    private static final int _MULTI_SHOOT_X_SPEED = 6 * 60;
+    private static final int _MULTI_SHOOT_X_SPEED_SM = 3 * 60;
+    private static final int _MULTI_SHOOT_Y_SPEED = 13 * 60;
+    private static final int _MULTI_SHOOT_Y_SPEED_SM = 7 * 60;
     public static final int STD_FRAME = 0;
     public static final int GIVE_LIFE_FRAME = 0;
     public static final int DOUBLE_DAMAGE_FRAME = 1;
@@ -39,8 +39,8 @@
     public static final int INVINCIBILITY_FRAME = 0;
     private static final int NUM_FRAMES = 3;
     private static final long INVINCIBILITY_TICKS = 5000;
-    private static final int _DOUBLE_DAMAGE_SPEED = -7;
-    private static final int _DOUBLE_DAMAGE_SPEED_SM = -4;
+    private static final int _DOUBLE_DAMAGE_SPEED = -7 * 60;
+    private static final int _DOUBLE_DAMAGE_SPEED_SM = -4 * 60;
     private static int DOUBLE_DAMAGE_SPEED;
     private float speedX, speedY;
     private long currentDelay;
@@ -146,11 +146,11 @@
             return false;
         }
         try {
-            if (getBoundingRectangle().overlaps(s.getBoundingRectangle())) {
+            if (Utility.intersects(this, s)) {
                 ret = true;
                 if (!(s instanceof BossSprite)) {
                     
-                    s.resetExplode();
+                    s.resetWithExplosion();
                 }
                 if (Utility.hasTimePassed(currentInvincibilityTime, invincibilityTime)) {
                     spPos.x = getX();
@@ -178,7 +178,7 @@
             return false;
         }
         try {
-            if (getBoundingRectangle().overlaps(s.getBoundingRectangle())) {
+            if (Utility.intersects(this, s)) {
                 ret = true;
                 s.reset();