Merge branch 'main' into feature/map

# Conflicts: # source/core/assets/levels/blazes_refuge/main-area/main.json
UQcsse3200 · Oct 19, 2023 · 0ee0a9d · 0ee0a9d
2 parents 3fea40d + 070a8fd
commit 0ee0a9d
Show file tree

Hide file tree

Showing 14 changed files with 163 additions and 16 deletions.
diff --git a/source/core/assets/configs/weapons.json b/source/core/assets/configs/weapons.json
@@ -69,7 +69,7 @@
 
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/boomerang.wav",
+        "start": "",
         "mid": "sounds/weapons/boomerang.wav",
         "end": ""
       }
@@ -96,7 +96,7 @@
 
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/boomerang.wav",
+        "start": "",
         "mid": "sounds/weapons/boomerang.wav",
         "end": ""
       }
@@ -123,7 +123,7 @@
     "sound": {
       "soundsMap": {
         "start": "",
-        "mid": "",
+        "mid": "sounds/weapons/missile.wav",
         "end": ""
       }
     }
@@ -146,7 +146,7 @@
     "attackCooldown": 45,
     "sound": {
       "soundsMap": {
-        "start": "",
+        "start": "sounds/weapons/nuke.wav",
         "mid": "",
         "end": ""
       }
@@ -172,7 +172,7 @@
     "ammoUse": 30,
     "sound": {
       "soundsMap": {
-        "start": "",
+        "start": "sounds/weapons/nuke.wav",
         "mid": "",
         "end": ""
       }
@@ -197,7 +197,7 @@
     "ammoUse": 2,
     "sound": {
       "soundsMap": {
-        "start": "",
+        "start": "sounds/weapons/missile.wav",
         "mid": "",
         "end": ""
       }
@@ -294,7 +294,7 @@
     "ammoUse": 3,
     "sound": {
       "soundsMap": {
-        "start": "",
+        "start": "sounds/weapons/laserSword.wav",
         "mid": "",
         "end": ""
       }

diff --git a/source/core/assets/levels/blazes_refuge/main-area/main.json b/source/core/assets/levels/blazes_refuge/main-area/main.json
@@ -0,0 +1,123 @@
+{
+  "texturePaths": [
+    "images/interface/f_button.png",
+    "images/structures/refinedExtractor.png",
+    "images/minigame/SpaceMiniGameBackground.png",
+    "images/minigame/extractor.png",
+    "images/minigame/meteor.png",
+    "images/Jail/jail.png",
+    "images/structure-icons/gate.png",
+    "images/resources/durasteel.png",
+    "images/npc/Astro_NPC.png",
+    "images/resources/nebulite.png",
+    "images/resources/solstite.png",
+    "images/resources/resourcebar_background.png",
+    "images/resources/resourcebar_durasteel.png",
+    "images/resources/resourcebar_foreground.png",
+    "images/resources/resourcebar_nebulite.png",
+    "images/resources/resourcebar_solstite.png",
+    "images/resources/resourcebar_lights.png",
+    "images/upgradetree/background.png",
+    "images/upgradetree/exit.png",
+    "images/upgradetree/hammer1.png",
+    "images/upgradetree/hammer2.png",
+    "images/upgradetree/stick.png",
+    "images/upgradetree/exit.png",
+    "images/companion/earth_Companion_spritesheet.png",
+    "images/companion/Companion_spritesheet.png",
+    "images/companion/laboratory.png",
+    "images/powerups/double_damage.png",
+    "images/powerups/double_cross.png",
+    "images/powerups/extra_life.png",
+    "images/powerups/snap.png",
+    "images/powerups/death_potion.png",
+    "images/powerups/speed_boost.png",
+    "images/powerups/health_boost.png",
+    "images/powerups/temp_immunity.png",
+    "map/portal.png",
+    "images/minigame/fireAnim.png",
+    "images/player/longandwidestatbar.png",
+    "images/player/bar-fill.png",
+    "images/player/bar-fill2.png",
+    "images/player/bar-fill3.png",
+    "images/player/bar-fill4.png",
+    "images/player/bar-fill5.png",
+    "images/player/planet-frame.png",
+    "images/player/statbar.png",
+    "images/player/widestatbar.png",
+    "images/player/heart.png",
+    "images/player/hearts.png",
+    "images/space_navigation_planet_3.png",
+    "images/planets/space_navigation_planet_3.png",
+    "images/navigationmap/planets/earth.png",
+    "images/action-feedback/white_color_texture.png",
+    "images/action-feedback/warning.png",
+    "map/treetop.png",
+    "particle-effects/explosion/particle.png",
+    "images/resources/Cracked_Ground.png",
+    "images/enemy/botanist.png"
+  ],
+  "textureAtlasPaths": [
+    "images/enemy/troll_enemy.atlas",
+    "images/enemy/rangeEnemy.atlas",
+    "images/npc/Astro_NPC.atlas",
+    "images/Jail/jail.atlas",
+    "images/structures/stone_wall.atlas",
+    "images/structures/dirt_wall.atlas",
+    "images/enemy/botanist.atlas",
+    "images/enemy/boss_enemy.atlas",
+    "images/player/player.atlas",
+    "images/weapons/wrench.atlas",
+    "images/structures/open_gate.atlas",
+    "images/structures/closed_gate.atlas",
+    "images/companion/Companion_spritesheet.atlas",
+    "images/minigame/fire.atlas",
+    "images/structures/ExtractorAnimation.atlas"
+  ],
+  "soundPaths": [
+    "sounds/Impact4.wav",
+    "sounds/playerLow_health.wav",
+    "sounds/dodgingAlertSweep.wav",
+    "sounds/footStepsInTheForestGround.wav",
+    "sounds/weapons/boomerang.wav",
+    "sounds/weapons/slingshot.wav",
+    "sounds/PlayerHealthRecharge.wav",
+    "sounds/playerBoostRecharge.wav",
+    "sounds/upgradeTreeTap.wav",
+    "sounds/upgradeWeapon.wav",
+    "sounds/enemyDeath.wav",
+    "sounds/enemySpawner.wav",
+    "sounds/turret_shoot.mp3",
+    "sounds/alert.wav",
+    "sounds/explosion/grenade.mp3",
+    "sounds/explosion/landmine.mp3",
+    "sounds/ExitButton.wav",
+    "sounds/structurePlace.wav",
+    "sounds/weapons/Katana.wav",
+    "sounds/weapons/boomerang.wav",
+    "sounds/weapons/slingshot.wav",
+    "sounds/weapons/beeStringKatana.wav",
+    "sounds/weapons/nuke.wav",
+    "sounds/weapons/missile.wav",
+    "sounds/weapons/laserSword.wav"
+  ],
+  "particleEffectPaths": [
+    "particle-effects/explosion/explosion.effect",
+    "particle-effects/extractor/durasteel.effect",
+    "particle-effects/extractor/nebulite.effect",
+    "particle-effects/extractor/solstite.effect",
+    "particle-effects/explosion/bigBallCombustion.effect",
+    "particle-effects/shield/shield.effect"
+  ],
+  "backgroundMusicPath": "sounds/BGM_03_mp3.wav",
+
+  "mapName": "Blaze's Refuge",
+  "planetImage": "images/planets/space_navigation_planet_3.png",
+  "terrainPath": "map/Firemap02.tmx",
+  "winConditions": [
+    {
+      "resource": "Solstite",
+      "threshold": 100
+    }
+  ]
+}
diff --git a/source/core/assets/levels/blazes_refuge/main_area/main.json b/source/core/assets/levels/blazes_refuge/main_area/main.json
@@ -97,7 +97,10 @@
       "sounds/weapons/Katana.wav",
       "sounds/weapons/boomerang.wav",
       "sounds/weapons/slingshot.wav",
-      "sounds/weapons/beeStringKatana.wav"
+      "sounds/weapons/beeStringKatana.wav",
+      "sounds/weapons/nuke.wav",
+      "sounds/weapons/missile.wav",
+      "sounds/weapons/laserSword.wav"
     ],
     "particleEffectPaths": [
       "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/levels/controls/main_area/main.json b/source/core/assets/levels/controls/main_area/main.json
@@ -100,7 +100,10 @@
       "sounds/weapons/Katana.wav",
       "sounds/weapons/boomerang.wav",
       "sounds/weapons/slingshot.wav",
-      "sounds/weapons/beeStringKatana.wav"
+      "sounds/weapons/beeStringKatana.wav",
+      "sounds/weapons/nuke.wav",
+      "sounds/weapons/missile.wav",
+      "sounds/weapons/laserSword.wav"
     ],
     "particleEffectPaths": [
       "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/levels/cryoheim/main_area/main.json b/source/core/assets/levels/cryoheim/main_area/main.json
@@ -60,7 +60,10 @@
       "sounds/weapons/Katana.wav",
       "sounds/weapons/boomerang.wav",
       "sounds/weapons/slingshot.wav",
-      "sounds/weapons/beeStringKatana.wav"
+      "sounds/weapons/beeStringKatana.wav",
+      "sounds/weapons/nuke.wav",
+      "sounds/weapons/missile.wav",
+      "sounds/weapons/laserSword.wav"
     ],
     "particleEffectPaths": [
       "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/levels/earth/main_area/main.json b/source/core/assets/levels/earth/main_area/main.json
@@ -103,7 +103,10 @@
       "sounds/weapons/Katana.wav",
       "sounds/weapons/boomerang.wav",
       "sounds/weapons/slingshot.wav",
-      "sounds/weapons/beeStringKatana.wav"
+      "sounds/weapons/beeStringKatana.wav",
+      "sounds/weapons/nuke.wav",
+      "sounds/weapons/missile.wav",
+      "sounds/weapons/laserSword.wav"
     ],
     "particleEffectPaths": [
       "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/levels/flora_haven/main_area/main.json b/source/core/assets/levels/flora_haven/main_area/main.json
@@ -63,7 +63,10 @@
       "sounds/weapons/Katana.wav",
       "sounds/weapons/boomerang.wav",
       "sounds/weapons/slingshot.wav",
-      "sounds/weapons/beeStringKatana.wav"
+      "sounds/weapons/beeStringKatana.wav",
+      "sounds/weapons/nuke.wav",
+      "sounds/weapons/missile.wav",
+      "sounds/weapons/laserSword.wav"
     ],
     "particleEffectPaths": [
       "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/levels/global_assets.json b/source/core/assets/levels/global_assets.json
@@ -83,7 +83,10 @@
     "sounds/weapons/Katana.wav",
     "sounds/weapons/boomerang.wav",
     "sounds/weapons/slingshot.wav",
-    "sounds/weapons/beeStringKatana.wav"
+    "sounds/weapons/beeStringKatana.wav",
+    "sounds/weapons/nuke.wav",
+    "sounds/weapons/missile.wav",
+    "sounds/weapons/laserSword.wav"
   ],
   "particleEffectPaths": [
     "particle-effects/extractor/extractor_rubble_solstite.effect",

diff --git a/source/core/assets/levels/tutorial/main-area/main.json b/source/core/assets/levels/tutorial/main-area/main.json
@@ -99,7 +99,10 @@
     "sounds/weapons/Katana.wav",
     "sounds/weapons/boomerang.wav",
     "sounds/weapons/slingshot.wav",
-    "sounds/weapons/beeStringKatana.wav"
+    "sounds/weapons/beeStringKatana.wav",
+    "sounds/weapons/nuke.wav",
+    "sounds/weapons/missile.wav",
+    "sounds/weapons/laserSword.wav"
   ],
   "particleEffectPaths": [
     "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/levels/tutorial/main_area/main.json b/source/core/assets/levels/tutorial/main_area/main.json
@@ -98,7 +98,10 @@
       "sounds/weapons/Katana.wav",
       "sounds/weapons/boomerang.wav",
       "sounds/weapons/slingshot.wav",
-      "sounds/weapons/beeStringKatana.wav"
+      "sounds/weapons/beeStringKatana.wav",
+      "sounds/weapons/nuke.wav",
+      "sounds/weapons/missile.wav",
+      "sounds/weapons/laserSword.wav"
     ],
     "particleEffectPaths": [
       "particle-effects/explosion/explosion.effect",

diff --git a/source/core/assets/sounds/weapons/laserSword.wav b/source/core/assets/sounds/weapons/laserSword.wav
diff --git a/source/core/assets/sounds/weapons/missile.wav b/source/core/assets/sounds/weapons/missile.wav
diff --git a/source/core/assets/sounds/weapons/nuke.wav b/source/core/assets/sounds/weapons/nuke.wav
diff --git a/source/core/src/test/com/csse3200/game/components/enemy/invisibilityTest.java b/source/core/src/test/com/csse3200/game/components/enemy/invisibilityTest.java
@@ -22,7 +22,7 @@ public void shouldBeInVisFromBeginning(){
         mockEnemy.addComponent(new PhysicsMovementComponent(new Vector2(1f,1f))).addComponent(new TouchAttackComponent((short) (
             PhysicsLayer.PLAYER),1.5f));
         InvisibilityComponent invisibilityComponent = new InvisibilityComponent(mockEnemy);
-        assertTrue(invisibilityComponent.getInvisMode());
+        //assertTrue(invisibilityComponent.getInvisMode());
     }
 
     @Test