Merge pull request #110 from UQcsse3200/Team-1--Projectiles

Team 1 - new projectile animations and mob balls merge to main
UQcsse3200 · Sep 7, 2023 · 37222ae · 37222ae
2 parents d041b68 + 18a01da
commit 37222ae
Show file tree

Hide file tree

Showing 41 changed files with 2,082 additions and 248 deletions.
diff --git a/hs_err_pid11232.log b/hs_err_pid11232.log
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/ingamebg.png b/source/core/assets/images/ingamebg.png
diff --git a/source/core/assets/images/projectiles/basic_projectile.atlas b/source/core/assets/images/projectiles/basic_projectile.atlas
@@ -0,0 +1,34 @@
+
+basic_projectile.png
+size: 256, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 36, 19
+  orig: 36, 19
+  offset: 0, 0
+  index: 4
+projectileFinal
+  rotate: false
+  xy: 103, 3
+  size: 30, 18
+  orig: 30, 18
+  offset: 0, 0
+  index: 3
+projectile
+  rotate: false
+  xy: 40, 2
+  size: 30, 19
+  orig: 30, 19
+  offset: 0, 0
+  index: 2
+projectile
+  rotate: false
+  xy: 72, 2
+  size: 29, 19
+  orig: 29, 19
+  offset: 0, 0
+  index: 1
diff --git a/source/core/assets/images/projectiles/basic_projectile.png b/source/core/assets/images/projectiles/basic_projectile.png
diff --git a/source/core/assets/images/projectiles/mobProjectile.atlas b/source/core/assets/images/projectiles/mobProjectile.atlas
@@ -0,0 +1,41 @@
+
+mobProjectile.png
+size: 128, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+rotate
+  rotate: false
+  xy: 80, 2
+  size: 24, 23
+  orig: 24, 23
+  offset: 0, 0
+  index: -1
+rotate
+  rotate: false
+  xy: 28, 2
+  size: 24, 23
+  orig: 24, 23
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 54, 2
+  size: 24, 23
+  orig: 24, 23
+  offset: 0, 0
+  index: -1
+rotate
+  rotate: false
+  xy: 2, 2
+  size: 24, 23
+  orig: 24, 23
+  offset: 0, 0
+  index: -1
+rotate
+  rotate: false
+  xy: 54, 2
+  size: 24, 23
+  orig: 24, 23
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/mobProjectile.png b/source/core/assets/images/projectiles/mobProjectile.png
diff --git a/.../assets/images/projectiles/projectile.png → ...assets/images/projectiles/projectile2.png b/.../assets/images/projectiles/projectile.png → ...assets/images/projectiles/projectile2.png
diff --git a/source/core/assets/images/terrain_use.png b/source/core/assets/images/terrain_use.png
diff --git a/source/core/assets/images/towers/TNTTower.atlas b/source/core/assets/images/towers/TNTTower.atlas
@@ -0,0 +1,104 @@
+
+TNTTower.png
+size: 1024, 128
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+default
+  rotate: false
+  xy: 773, 104
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 0
+dig
+  rotate: false
+  xy: 2, 21
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 4
+dig
+  rotate: false
+  xy: 751, 104
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 1
+dig
+  rotate: false
+  xy: 2, 2
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 3
+dig
+  rotate: false
+  xy: 24, 21
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 0
+dig
+  rotate: false
+  xy: 751, 85
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 5
+dig
+  rotate: false
+  xy: 24, 2
+  size: 20, 17
+  orig: 20, 17
+  offset: 0, 0
+  index: 2
+explode
+  rotate: false
+  xy: 2, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 2
+explode
+  rotate: false
+  xy: 109, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 4
+explode
+  rotate: false
+  xy: 216, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 1
+explode
+  rotate: false
+  xy: 323, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 6
+explode
+  rotate: false
+  xy: 430, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 3
+explode
+  rotate: false
+  xy: 537, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 0
+explode
+  rotate: false
+  xy: 644, 40
+  size: 105, 81
+  orig: 105, 81
+  offset: 0, 0
+  index: 5
diff --git a/source/core/assets/images/towers/TNTTower.png b/source/core/assets/images/towers/TNTTower.png
diff --git a/source/core/src/main/com/csse3200/game/ai/tasks/AITaskComponent.java b/source/core/src/main/com/csse3200/game/ai/tasks/AITaskComponent.java
@@ -67,7 +67,7 @@ private PriorityTask getHighestPriorityTask() {
     }
   }
 
-  private void changeTask(PriorityTask desiredTask) {
+  public void changeTask(PriorityTask desiredTask) {
     logger.debug("{} Changing to task {}", this, desiredTask);
     if (currentTask != null) {
       currentTask.stop();