Dynamically places portals y-position dependant on the map floor

UQdeco2800 · Oct 10, 2021 · 3f56a59 · 3f56a59
1 parent 2873ded
commit 3f56a59
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/source/core/src/main/com/deco2800/game/areas/ForestGameArea.java b/source/core/src/main/com/deco2800/game/areas/ForestGameArea.java
@@ -449,7 +449,8 @@ private void spawnRobot() {
 
   private void spawnPortal() {
     GridPoint2 tileBounds = terrain.getMapBounds(0);
-    GridPoint2 pos1 = new GridPoint2(tileBounds.x - 2, 12);
+    int posY = terrainFactory.getYOfSurface(tileBounds.x - 2, GdxGame.ScreenType.MAIN_GAME);
+    GridPoint2 pos1 = new GridPoint2(tileBounds.x - 2, posY + 2);
     this.endPortal = ObstacleFactory.createPortal();
     spawnEntityAt(this.endPortal, pos1, true, true);
   }

diff --git a/source/core/src/main/com/deco2800/game/areas/LevelThreeArea.java b/source/core/src/main/com/deco2800/game/areas/LevelThreeArea.java
@@ -3,6 +3,7 @@
 import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.math.GridPoint2;
 import com.badlogic.gdx.math.Vector2;
+import com.deco2800.game.GdxGame;
 import com.deco2800.game.areas.terrain.TerrainFactory;
 import com.deco2800.game.areas.terrain.TerrainFactory.TerrainType;
 import com.deco2800.game.components.CameraComponent;
@@ -355,6 +356,11 @@ private void spawnRobot() {
 
     private void spawnPortal() {
         GridPoint2 tileBounds = terrain.getMapBounds(0);
+
+        // Use this when text file is supplied
+        // int posY = terrainFactory.getYOfSurface(tileBounds.x - 2, GdxGame.ScreenType.LEVEL_THREE_GAME);
+        // GridPoint2 pos1 = new GridPoint2(tileBounds.x - 2, posY + 2);
+
         GridPoint2 pos1 = new GridPoint2(tileBounds.x - 2, 12);
         this.endPortal = ObstacleFactory.createPortal();
         spawnEntityAt(this.endPortal, pos1, true, true);

diff --git a/source/core/src/main/com/deco2800/game/areas/LevelTwoArea.java b/source/core/src/main/com/deco2800/game/areas/LevelTwoArea.java
@@ -424,7 +424,8 @@ private void spawnRobot() {
 
     private void spawnPortal() {
         GridPoint2 tileBounds = terrain.getMapBounds(0);
-        GridPoint2 pos1 = new GridPoint2(tileBounds.x - 2, 7);
+        int posY = terrainFactory.getYOfSurface(tileBounds.x - 2, GdxGame.ScreenType.LEVEL_TWO_GAME);
+        GridPoint2 pos1 = new GridPoint2(tileBounds.x - 2, posY + 2);
         this.endPortal = ObstacleFactory.createPortal();
         spawnEntityAt(this.endPortal, pos1, true, true);
     }