Merge remote-tracking branch 'origin/t3branch' into t3branch

# Conflicts: # source/core/src/main/com/csse3200/game/GdxGame.java
UQcsse3200 · Oct 15, 2023 · 03e729f · 03e729f
2 parents 867accd + 7dd01a8
commit 03e729f
Show file tree

Hide file tree

Showing 84 changed files with 2,667 additions and 10,235 deletions.
diff --git a/hs_err_pid11232.log b/hs_err_pid11232.log
diff --git a/hs_err_pid14780.log b/hs_err_pid14780.log
diff --git a/hs_err_pid19432.log b/hs_err_pid19432.log
diff --git a/hs_err_pid22188.log b/hs_err_pid22188.log
diff --git a/hs_err_pid22716.log b/hs_err_pid22716.log
diff --git a/hs_err_pid26164.log b/hs_err_pid26164.log
diff --git a/hs_err_pid27428.log b/hs_err_pid27428.log
diff --git a/hs_err_pid28328.log b/hs_err_pid28328.log
diff --git a/hs_err_pid29160.log b/hs_err_pid29160.log
diff --git a/source/core/assets/configs/Boss.json b/source/core/assets/configs/Boss.json
@@ -1,7 +1,5 @@
 {
   "mobBoss": {
-    "health": 100,
-    "baseAttack": 25,
-    "spookyFactor": 7
+    "baseAttack": 0
   }
 }
diff --git a/source/core/assets/images/background/main_menu/main_menu_bg.png b/source/core/assets/images/background/main_menu/main_menu_bg.png
diff --git a/source/core/assets/images/background/settings/settings_bg.png b/source/core/assets/images/background/settings/settings_bg.png
diff --git a/source/core/assets/images/mobs/arcane_archer.atlas b/source/core/assets/images/mobs/arcane_archer.atlas
@@ -0,0 +1,223 @@
+
+arcane_archer.png
+size: 512, 256
+format: RGBA8888
+filter: Nearest, Nearest
+repeat: none
+arcane_archer_attack
+  rotate: false
+  xy: 290, 2
+  size: 65, 44
+  orig: 65, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_attack
+  rotate: false
+  xy: 362, 140
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_attack
+  rotate: false
+  xy: 146, 94
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_attack
+  rotate: false
+  xy: 74, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_attack
+  rotate: false
+  xy: 362, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_attack
+  rotate: false
+  xy: 218, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_attack
+  rotate: false
+  xy: 362, 94
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 2, 2
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 2, 140
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 146, 48
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 74, 94
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 434, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 218, 140
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 2, 94
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_death
+  rotate: false
+  xy: 146, 2
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 434, 140
+  size: 69, 44
+  orig: 69, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 290, 140
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 146, 140
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 290, 48
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 74, 2
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 146, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_dodge
+  rotate: false
+  xy: 290, 94
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 74, 48
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 2, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 218, 94
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 2, 48
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 218, 2
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 290, 186
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 74, 140
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+arcane_archer_run
+  rotate: false
+  xy: 218, 48
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
+default
+  rotate: false
+  xy: 218, 48
+  size: 70, 44
+  orig: 70, 44
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/mobs/arcane_archer.png b/source/core/assets/images/mobs/arcane_archer.png