Merge branch 'main' into Team-7--Code-Smells

UQcsse3200 · Oct 17, 2023 · 66e8299 · 66e8299
2 parents ce87c1b + 783f687
commit 66e8299
Show file tree

Hide file tree

Showing 87 changed files with 731 additions and 1,291 deletions.
diff --git a/source/core/assets/images/mobs/skeleton.atlas b/source/core/assets/images/mobs/skeleton.atlas
@@ -69,7 +69,7 @@ skeleton_attack
   index: -1
 skeleton_attack
   rotate: false
-  xy: 514, 2
+  xy: 578, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -83,7 +83,7 @@ skeleton_attack
   index: -1
 skeleton_attack
   rotate: false
-  xy: 770, 2
+  xy: 834, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -95,41 +95,6 @@ skeleton_attack
   orig: 62, 48
   offset: 0, 0
   index: -1
-skeleton_death
-  rotate: false
-  xy: 1026, 2
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 66, 52
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 834, 52
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 1154, 55
-  size: 62, 45
-  orig: 62, 45
-  offset: 0, 0
-  index: -1
-skeleton_death
-  rotate: false
-  xy: 578, 2
-  size: 62, 48
-  orig: 62, 48
-  offset: 0, 0
-  index: -1
 skeleton_death
   rotate: false
   xy: 194, 52
@@ -188,7 +153,7 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 514, 52
+  xy: 514, 2
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -202,7 +167,7 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 770, 52
+  xy: 770, 2
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
@@ -237,21 +202,21 @@ skeleton_walk
   index: -1
 skeleton_walk
   rotate: false
-  xy: 578, 52
+  xy: 514, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
   index: -1
 skeleton_walk
   rotate: false
-  xy: 130, 2
+  xy: 66, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0
   index: -1
 skeleton_walk
   rotate: false
-  xy: 834, 2
+  xy: 770, 52
   size: 62, 48
   orig: 62, 48
   offset: 0, 0

diff --git a/source/core/assets/images/mobs/skeleton.png b/source/core/assets/images/mobs/skeleton.png
diff --git a/source/core/assets/images/spanner.png b/source/core/assets/images/spanner.png
diff --git a/source/core/assets/images/turret-select/droid-tower-selected.png b/source/core/assets/images/turret-select/droid-tower-selected.png
diff --git a/source/core/assets/images/turret-select/fire-tower-clicked.png b/source/core/assets/images/turret-select/fire-tower-clicked.png
diff --git a/source/core/assets/images/turret-select/fire-tower-selected.png b/source/core/assets/images/turret-select/fire-tower-selected.png
diff --git a/source/core/assets/images/turret-select/firework-tower-default.png b/source/core/assets/images/turret-select/firework-tower-default.png
diff --git a/source/core/assets/images/turret-select/firework-tower-selected.png b/source/core/assets/images/turret-select/firework-tower-selected.png
diff --git a/source/core/assets/images/turret-select/mine-tower-selected.png b/source/core/assets/images/turret-select/mine-tower-selected.png
diff --git a/source/core/assets/images/turret-select/pierce-tower-default.png b/source/core/assets/images/turret-select/pierce-tower-default.png
diff --git a/source/core/assets/images/turret-select/pierce-tower-selected.png b/source/core/assets/images/turret-select/pierce-tower-selected.png
diff --git a/source/core/assets/images/turret-select/ricochet-tower-default.png b/source/core/assets/images/turret-select/ricochet-tower-default.png
diff --git a/source/core/assets/images/turret-select/ricochet-tower-selected.png b/source/core/assets/images/turret-select/ricochet-tower-selected.png
diff --git a/source/core/assets/images/turret-select/stun-tower-selected.png b/source/core/assets/images/turret-select/stun-tower-selected.png
diff --git a/source/core/assets/images/turret-select/tnt-tower-selected.png b/source/core/assets/images/turret-select/tnt-tower-selected.png
diff --git a/source/core/assets/images/turret-select/wall-tower-default.png b/source/core/assets/images/turret-select/wall-tower-default.png
diff --git a/source/core/assets/images/turret-select/wall-tower-selected.png b/source/core/assets/images/turret-select/wall-tower-selected.png
diff --git a/source/core/assets/images/turret-select/weapon-tower-selected.png b/source/core/assets/images/turret-select/weapon-tower-selected.png