Merge branch 'main-recovery' into Team-3-maps-main

UQcsse3200 · Sep 12, 2023 · eb87b4c · eb87b4c
2 parents 610aeb7 + efd438d
commit eb87b4c
Show file tree

Hide file tree

Showing 101 changed files with 3,807 additions and 851 deletions.
diff --git a/source/core/assets/configs/tower.json b/source/core/assets/configs/tower.json
@@ -33,6 +33,5 @@
     "health": 10,
     "baseAttack": 10,
     "cost": 10
-
   }
 }
diff --git a/source/core/assets/images/economy/crystalBanner.png b/source/core/assets/images/economy/crystalBanner.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/scrapBanner.png b/source/core/assets/images/economy/scrapBanner.png
diff --git a/source/core/assets/images/economy/scrapsUI.png b/source/core/assets/images/economy/scrapsUI.png
diff --git a/source/core/assets/images/engineers/engineerBanner.png b/source/core/assets/images/engineers/engineerBanner.png
diff --git a/...allpaper-simple-stars-video-background-loop-black-and-white-aesthetic-space.jpg b/...allpaper-simple-stars-video-background-loop-black-and-white-aesthetic-space.jpg
diff --git a/source/core/assets/images/lose-screen/lose-bg.jpg b/source/core/assets/images/lose-screen/lose-bg.jpg
diff --git a/source/core/assets/images/xeno-Grunt.png → ...ce/core/assets/images/mobs/xeno-Grunt.png b/source/core/assets/images/xeno-Grunt.png → ...ce/core/assets/images/mobs/xeno-Grunt.png
diff --git a/source/core/assets/images/xenoGrunt.atlas → ...e/core/assets/images/mobs/xenoGrunt.atlas b/source/core/assets/images/xenoGrunt.atlas → ...e/core/assets/images/mobs/xenoGrunt.atlas
diff --git a/source/core/assets/images/projectiles/burn_effect.atlas b/source/core/assets/images/projectiles/burn_effect.atlas
@@ -0,0 +1,55 @@
+
+burn_effect.png
+size: 256, 64
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 78, 2
+  size: 36, 31
+  orig: 36, 31
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 36, 31
+  orig: 36, 31
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 154, 2
+  size: 35, 31
+  orig: 35, 31
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 40, 2
+  size: 36, 31
+  orig: 36, 31
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 116, 2
+  size: 36, 31
+  orig: 36, 31
+  offset: 0, 0
+  index: -1
+projectileFinal
+  rotate: false
+  xy: 191, 2
+  size: 31, 31
+  orig: 31, 31
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 78, 2
+  size: 36, 31
+  orig: 36, 31
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/burn_effect.png b/source/core/assets/images/projectiles/burn_effect.png
diff --git a/source/core/assets/images/projectiles/firework_anim.atlas b/source/core/assets/images/projectiles/firework_anim.atlas
@@ -0,0 +1,41 @@
+
+firework_anim.png
+size: 128, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 23, 2
+  size: 19, 16
+  orig: 19, 16
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 65, 2
+  size: 19, 16
+  orig: 19, 16
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 44, 2
+  size: 19, 16
+  orig: 19, 16
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 19, 16
+  orig: 19, 16
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 23, 2
+  size: 19, 16
+  orig: 19, 16
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/firework_anim.png b/source/core/assets/images/projectiles/firework_anim.png
diff --git a/source/core/assets/images/projectiles/oldstun_effect.atlas b/source/core/assets/images/projectiles/oldstun_effect.atlas
@@ -0,0 +1,41 @@
+
+stun_effect.png
+size: 256, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 86, 3
+  size: 41, 27
+  orig: 41, 27
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 40, 28
+  orig: 40, 28
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 129, 2
+  size: 40, 28
+  orig: 40, 28
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 44, 2
+  size: 40, 28
+  orig: 40, 28
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 86, 3
+  size: 41, 27
+  orig: 41, 27
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/oldstun_effect.png b/source/core/assets/images/projectiles/oldstun_effect.png
diff --git a/source/core/assets/images/projectiles/pierce_anim.atlas b/source/core/assets/images/projectiles/pierce_anim.atlas
@@ -0,0 +1,42 @@
+
+pierce_anim.png
+size: 256, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 35, 26
+  orig: 35, 26
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 76, 2
+  size: 35, 26
+  orig: 35, 26
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 39, 2
+  size: 35, 26
+  orig: 35, 26
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 113, 2
+  size: 35, 26
+  orig: 35, 26
+  offset: 0, 0
+  index: -1
+default
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 35, 26
+  orig: 35, 26
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/pierce_anim.png b/source/core/assets/images/projectiles/pierce_anim.png
diff --git a/source/core/assets/images/projectiles/stun_effect.atlas b/source/core/assets/images/projectiles/stun_effect.atlas
@@ -0,0 +1,41 @@
+
+stun_effect.png
+size: 128, 32
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+projectile
+  rotate: false
+  xy: 2, 2
+  size: 21, 19
+  orig: 21, 19
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 48, 2
+  size: 20, 19
+  orig: 20, 19
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 25, 2
+  size: 21, 19
+  orig: 21, 19
+  offset: 0, 0
+  index: -1
+projectile
+  rotate: false
+  xy: 70, 2
+  size: 17, 19
+  orig: 17, 19
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 2, 2
+  size: 21, 19
+  orig: 21, 19
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/projectiles/stun_effect.png b/source/core/assets/images/projectiles/stun_effect.png