Resolved merge conflicts: 1.

UQcsse3200 · Oct 2, 2023 · 6a5b171 · 6a5b171
2 parents 770dbd3 + 161524a
commit 6a5b171
Show file tree

Hide file tree

Showing 246 changed files with 16,223 additions and 2,255 deletions.
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,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/GrassTile/grass_tile_1.png b/source/core/assets/images/GrassTile/grass_tile_1.png
diff --git a/source/core/assets/images/GrassTile/grass_tile_2.png b/source/core/assets/images/GrassTile/grass_tile_2.png
diff --git a/source/core/assets/images/GrassTile/grass_tile_3.png b/source/core/assets/images/GrassTile/grass_tile_3.png
diff --git a/source/core/assets/images/GrassTile/grass_tile_4.png b/source/core/assets/images/GrassTile/grass_tile_4.png
diff --git a/source/core/assets/images/GrassTile/grass_tile_5.png b/source/core/assets/images/GrassTile/grass_tile_5.png
diff --git a/source/core/assets/images/GrassTile/grass_tile_6.png b/source/core/assets/images/GrassTile/grass_tile_6.png
diff --git a/source/core/assets/images/GrassTile/grass_tile_7.png b/source/core/assets/images/GrassTile/grass_tile_7.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/grass_2.png b/source/core/assets/images/grass_2.png
diff --git a/source/core/assets/images/highlight_tile.png b/source/core/assets/images/highlight_tile.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