Merge pull request #192 from UQcsse3200/Mohamad-Maps

Mohamad maps
UQcsse3200 · Sep 27, 2023 · cb36f90 · cb36f90
2 parents 36cd05e + 8ded0af
commit cb36f90
Show file tree

Hide file tree

Showing 12 changed files with 138 additions and 322 deletions.
diff --git a/source/core/assets/images/Dusty_MoonBG.png b/source/core/assets/images/Dusty_MoonBG.png
diff --git a/source/core/assets/images/desert_bg.png b/source/core/assets/images/desert_bg.png
diff --git a/source/core/assets/images/desert_bg2.png b/source/core/assets/images/desert_bg2.png
diff --git a/source/core/assets/images/ice_bg.png b/source/core/assets/images/ice_bg.png
diff --git a/source/core/assets/images/ice_bg1.png b/source/core/assets/images/ice_bg1.png
diff --git a/source/core/assets/images/lava_bg.png b/source/core/assets/images/lava_bg.png
diff --git a/source/core/assets/images/lava_bg1.png b/source/core/assets/images/lava_bg1.png
diff --git a/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java b/source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
@@ -1,6 +1,8 @@
 package com.csse3200.game.areas;
 
 import com.badlogic.gdx.audio.Music;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.SpriteBatch;
 import com.badlogic.gdx.math.GridPoint2;
 import com.badlogic.gdx.math.Vector2;
 import com.csse3200.game.components.ProjectileEffects;
@@ -255,37 +257,16 @@ public void create() {
     player = spawnPlayer();
     player.getEvents().addListener("spawnWave", this::spawnWave);
     playMusic();
-
-    // spawnFireTowerTowerAt(3, 1);
-    // spawnFireTowerTowerAt(3, 2);
-    // spawnFireTowerTowerAt(3, 3);
-    // spawnFireTowerTowerAt(3, 4);
-    // spawnFireTowerTowerAt(3, 5);
-    // spawnDroidTowerAt(3, 1);
-    // spawnDroidTowerAt(3, 2);
-    // spawnDroidTowerAt(3, 3);
-    // spawnDroidTowerAt(3, 4);
-    // spawnDroidTowerAt(3, 5);
-    // spawnSplittingXenoGrunt(15, 5);
+    spawnXenoGrunts();
+    startWaveTimer();
+    spawnScrap();
     spawnDeflectXenoGrunt(15, 5);
     spawnSplittingXenoGrunt(15, 4);
-    // spawnSplittingXenoGrunt(15, 5);
-    // spawnDodgingDragonKnight(15, 3);
-    // spawnDemonBoss();
-    // spawnPatrickBoss();
-  //  spawnFireWorm();
-
-    //mobBoss1 = spawnMobBoss1();
-  //  startWaveTimer();
-////    spawnIncome();
-   spawnScrap();
-   spawnTNTTower();
-   spawnWeaponTower();
-//
-  //  spawnGapScanners();
+    spawnScrap();
+    spawnTNTTower();
+    spawnWeaponTower();
+    spawnGapScanners();
     spawnDroidTower();
-//
-//    mobBoss2 = spawnMobBoss2();
 
   }
 
@@ -298,8 +279,8 @@ private void displayUI() {
   }
 
   private void spawnTerrain() {
-    // Background terrain
-    terrain = terrainFactory.createTerrain(TerrainType.FOREST_DEMO);
+
+    terrain = terrainFactory.createTerrain(TerrainType.ALL_DEMO);
     spawnEntity(new Entity().addComponent(terrain));
 
     // Terrain walls
@@ -308,9 +289,11 @@ private void spawnTerrain() {
     Vector2 worldBounds = new Vector2(tileBounds.x * tileSize, tileBounds.y * tileSize);
 
     // Left
-    // ! THIS ONE DOESNT WORK. GRIDPOINTS2UTIL.ZERO is (0, 4), not (0, 0)
     spawnEntityAt(
-            ObstacleFactory.createWall(WALL_WIDTH, worldBounds.y), new GridPoint2(1, 0), false, false);
+            ObstacleFactory.createWall(WALL_WIDTH, worldBounds.y),
+            new GridPoint2(0, 2),
+            false,
+            false);
     // Right
     spawnEntityAt(
             ObstacleFactory.createWall(WALL_WIDTH, worldBounds.y),
@@ -324,12 +307,14 @@ private void spawnTerrain() {
             false,
             false);
     // Bottom
-    // spawnEntityAt(
-    //         ObstacleFactory.createWall(worldBounds.x, WALL_WIDTH), GridPoint2Utils.ZERO, false, false);
-    // * TMPORARY
     spawnEntityAt(
-            ObstacleFactory.createWall(worldBounds.x, WALL_WIDTH * 7), new GridPoint2(0, 0), false, false);
+            ObstacleFactory.createWall(worldBounds.x, WALL_WIDTH ),
+            new GridPoint2(0, 2),
+            false,
+            false);
   }
+
+
 //  private void spawnBuilding1() {
 //    GridPoint2 minPos = new GridPoint2(0, 0);
 //    GridPoint2 maxPos = terrain.getMapBounds(0).sub(2, 2);
@@ -600,7 +585,7 @@ private void spawnWaterSlime() {
 //  }
 
   private void spawnWeaponTower() {
-    GridPoint2 minPos = new GridPoint2(0, 0);
+    GridPoint2 minPos = new GridPoint2(0, 2);
     GridPoint2 maxPos = terrain.getMapBounds(0).sub(2, 2);
 
     for (int i = 0; i < NUM_WEAPON_TOWERS + 10; i++) {
@@ -629,7 +614,7 @@ private void spawnDroidTowerAt(int x, int y) {
   }
 
   private void spawnTNTTower() {
-    GridPoint2 minPos = new GridPoint2(0, 0);
+    GridPoint2 minPos = new GridPoint2(0, 2);
     GridPoint2 maxPos = terrain.getMapBounds(0).sub(2, 2);
 
     for (int i = 0; i < NUM_WEAPON_TOWERS; i++) {
@@ -641,7 +626,7 @@ private void spawnTNTTower() {
   }
 
   private void spawnDroidTower() {
-    GridPoint2 minPos = new GridPoint2(0, 0);
+    GridPoint2 minPos = new GridPoint2(0, 2);
     GridPoint2 maxPos = terrain.getMapBounds(0).sub(2, 2);
 
     for (int i = 0; i < NUM_WEAPON_TOWERS; i++) {