Merge branch 'Team-4---General-Mobs' into feature/Team4/integrate-ene…

…mies & change mob target to HUMANS # Conflicts: # source/core/src/main/com/csse3200/game/areas/ForestGameArea.java # source/core/src/main/com/csse3200/game/components/TouchAttackComponent.java # source/core/src/main/com/csse3200/game/components/tasks/MobAttackTask.java
UQcsse3200 · Sep 10, 2023 · d1a2a98 · d1a2a98
2 parents f832a84 + 72c1ca4
commit d1a2a98
Show file tree

Hide file tree

Showing 714 changed files with 4,336 additions and 340 deletions.
diff --git a/hs_err_pid11232.log b/hs_err_pid11232.log
diff --git a/source/core/assets/configs/Engineers.json b/source/core/assets/configs/Engineers.json
@@ -0,0 +1,6 @@
+{
+  "engineer" : {
+  "health": 100,
+  "baseAttack": 5
+}
+}
diff --git a/source/core/assets/configs/tower.json b/source/core/assets/configs/tower.json
@@ -13,5 +13,10 @@
     "health": 20,
     "baseAttack": 0,
     "cost": 1
+  },
+  "TNTTower": {
+    "health": 10,
+    "baseAttack": 5,
+    "cost": 1
   }
 }
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/economy/crystal.png b/source/core/assets/images/economy/crystal.png
diff --git a/source/core/assets/images/economy/crystalUI.png b/source/core/assets/images/economy/crystalUI.png
diff --git a/source/core/assets/images/economy/econ-tower.atlas b/source/core/assets/images/economy/econ-tower.atlas
@@ -0,0 +1,62 @@
+
+econ-tower.png
+size: 256, 64
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+idle
+  rotate: false
+  xy: 122, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 122, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 32, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 182, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 92, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 2, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 152, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
+move1
+  rotate: false
+  xy: 62, 2
+  size: 28, 31
+  orig: 28, 31
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/economy/econ-tower.png b/source/core/assets/images/economy/econ-tower.png