Merge branch 'Mohamad-Maps' into Team-3

# Conflicts: # source/core/src/main/com/csse3200/game/areas/ForestGameArea.java
UQcsse3200 · Sep 29, 2023 · fd3a94a · fd3a94a
2 parents 7586598 + 8ded0af
commit fd3a94a
Show file tree

Hide file tree

Showing 168 changed files with 6,116 additions and 1,599 deletions.
diff --git a/hs_err_pid27428.log b/hs_err_pid27428.log
diff --git a/source/core/assets/configs/Boss.json b/source/core/assets/configs/Boss.json
@@ -1,5 +1,5 @@
 {
-  "BossKing": {
+  "mobBoss": {
     "health": 100,
     "baseAttack": 25,
     "spookyFactor": 7

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/desert_bg.png b/source/core/assets/images/desert_bg.png
diff --git a/source/core/assets/images/desert_bg2.png b/source/core/assets/images/desert_bg2.png
diff --git a/source/core/assets/images/ice_bg.png b/source/core/assets/images/ice_bg.png
diff --git a/source/core/assets/images/ice_bg1.png b/source/core/assets/images/ice_bg1.png
diff --git a/source/core/assets/images/lava_bg.png b/source/core/assets/images/lava_bg.png
diff --git a/source/core/assets/images/lava_bg1.png b/source/core/assets/images/lava_bg1.png