Fixed code smell isPositionOccupied SpaceGameArea

UQcsse3200 · Oct 19, 2023 · 31f6545 · 31f6545
1 parent 55acf5a
commit 31f6545
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/source/core/src/main/com/csse3200/game/areas/SpaceGameArea.java b/source/core/src/main/com/csse3200/game/areas/SpaceGameArea.java
@@ -36,6 +36,7 @@ public class SpaceGameArea extends GameArea {
     private ArrayList<Entity> targetTables;
     private Random random;
     int randomX, randomY;
+    private Vector2 goalPosition;
 
     /**
      * Constructor for initializing terrain area
@@ -147,26 +148,25 @@ private void spawnAsteroids() {
      */
     public Entity spawnGoal() {
         random = new Random();
-        //int randomX, randomY;
-        GridPoint2 position;
         // Continue generating random positions until an unoccupied position is found.
         do {
             randomX = random.nextInt(terrain.getMapBounds(0).x);
             randomY = random.nextInt(terrain.getMapBounds(0).y);
-            position = new GridPoint2(randomX, randomY);
-        } while (isPositionOccupied(position));
+            goalPosition = new Vector2((float) randomX, (float) randomY);
+        } while (isPositionOccupied(goalPosition));
         Entity newGoal = MinigameObjectFactory.createObstacleGameGoal(WORMHOLE_SIZE, WORMHOLE_SIZE);
-        spawnEntityAt(newGoal, position, false, false);
+        spawnEntityAtVector(newGoal, goalPosition);
         goal = newGoal;
         return goal;
     }
 
     /**
      * Check if a position is occupied by an entity.
      */
-    public boolean isPositionOccupied(GridPoint2 position) {
+    public boolean isPositionOccupied(Vector2 position) {
         // Loop through the list of existing entities and check if any entity occupies the given position.
         for (Entity entity : targetTables) {
+            //GridPoint2 and Vector2 is unrelated
             if (entity != null && entity.getPosition().equals(position)) {
                 return true; // Position is occupied.
             }

diff --git a/source/core/src/main/com/csse3200/game/areas/map_config/MiniGameAssetsConfig.java b/source/core/src/main/com/csse3200/game/areas/map_config/MiniGameAssetsConfig.java
@@ -13,6 +13,7 @@ public class MiniGameAssetsConfig {
     public String[] textureAtlasPaths = null;
     public String[] backgroundMusicPath = null;
 
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
@@ -28,13 +29,16 @@ public boolean equals(Object o) {
         return Objects.equals(backgroundMusicPath, that.backgroundMusicPath);
     }
 
+    /*
+    Arrays problem, will fix later, currently assume there is no need for hashcode.
     @Override
     public int hashCode() {
         int result = Arrays.hashCode(texturePaths);
         result = 31 * result + Arrays.hashCode(textureAtlasPaths);
         result = 31 * result + (backgroundMusicPath != null ? backgroundMusicPath.hashCode() : 0);
         return result;
     }
+     */
 
     /**
      * Loads all assets contained within this config class