Code fixes

MovingBlocks · Mar 4, 2022 · 58cbfde · 58cbfde
1 parent e2900e3
commit 58cbfde
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/engine/src/main/java/org/destinationsol/rubble/systems/RubbleCreationSystem.java b/engine/src/main/java/org/destinationsol/rubble/systems/RubbleCreationSystem.java
@@ -53,6 +53,7 @@
 public class RubbleCreationSystem implements EventReceiver {
 
     public static final float SIZE_TO_RUBBLE_COUNT = 8f;
+    public static final float MIN_DIVISIBLE_SIZE = .1f;
     public static final float MIN_SCALE = .1f;
     public static final float MAX_SCALE = .3f;
     private static final float MAX_SPD = 40f;
@@ -116,7 +117,8 @@ private void buildRubblePieces(Position pos, Velocity vel, Angle angle, Size siz
             element.graphicsOffset = new Vector2();
 
             float scale = SolRandom.randomFloat(MIN_SCALE, MAX_SCALE);
-            element.setSize(scale * size.size);
+            float scaledSize = scale * size.size;
+            element.setSize(scaledSize);
 
             element.relativePosition = new Vector2();
             element.tint = Color.WHITE;
@@ -126,7 +128,7 @@ private void buildRubblePieces(Position pos, Velocity vel, Angle angle, Size siz
             //Create position component
             float velocityAngle = SolRandom.randomFloat(180);
             Vector2 position = new Vector2();
-            SolMath.fromAl(position, velocityAngle, SolRandom.randomFloat(size.size));
+            SolMath.fromAl(position, velocityAngle, SolRandom.randomFloat(scaledSize));
             position.add(basePos);
             Position positionComponent = new Position();
             positionComponent.position = position;
@@ -137,7 +139,7 @@ private void buildRubblePieces(Position pos, Velocity vel, Angle angle, Size siz
 
             //Create size component
             Size sizeComponent = new Size();
-            sizeComponent.size = scale * size.size;
+            sizeComponent.size = scaledSize;
 
             //Create velocity component
             Velocity velocityComponent = new Velocity();
@@ -148,7 +150,7 @@ private void buildRubblePieces(Position pos, Velocity vel, Angle angle, Size siz
             EntityRef entityRef = entitySystemManager.getEntityManager().createEntity(graphicsComponent, positionComponent,
                     sizeComponent, angle, velocityComponent, new RubbleMesh(), health);
 
-            if (sizeComponent.size > 0.1) {
+            if (scaledSize > MIN_DIVISIBLE_SIZE) {
                 entityRef.setComponent(new CreatesRubbleOnDestruction());
                 entityRef.setComponent(new DropsMoneyOnDestruction());
             }