Merge branch 'main' into feature/enemy

UQcsse3200 · Oct 19, 2023 · 248e762 · 248e762
2 parents 259e290 + 518c345
commit 248e762
Show file tree

Hide file tree

Showing 156 changed files with 1,862 additions and 1,389 deletions.
diff --git a/saves/savefile.json b/saves/savefile.json
@@ -1,41 +1,41 @@
 {
-entities: {
-	CompanionConfig: [
-		{
-			class: com.csse3200.game.entities.configs.CompanionConfig
-			position: {
-				x: 22
-				y: 24
-			}
-			health: 100
-			baseAttack: 5
-			attackMultiplier: 1
-		}
-	]
-	PlayerConfig: [
-		{
-			class: com.csse3200.game.entities.configs.PlayerConfig
-			spritePath: images/player/player.atlas
-			position: {
-				x: 23
-				y: 25
-			}
-			health: 100
-			baseAttack: 10
-			lives: 3
-			sounds: {
-				soundsMap: {
-					low_health: sounds/playerLow_health.wav
-					dodge: sounds/dodgingAlertSweep.wav
-					boostPowerup: sounds/playerBoostRecharge.wav
-					healthPowerup: sounds/PlayerHealthRecharge.wav
-					footstep: sounds/footStepsInTheForestGround.wav
-					upgradeWeapon: sounds/upgradeWeapon.wav
-					upgradeTree: sounds/upgradeTreeTap.wav
-					exitbutton: sounds/ExitButton.wav,
-				}
-			}
-		}
-	]
-}
+  entities: {
+    CompanionConfig: [
+      {
+        class: com.csse3200.game.entities.configs.CompanionConfig
+        position: {
+          x: 22
+          y: 24
+        }
+        health: 100
+        baseAttack: 5
+        attackMultiplier: 1
+      }
+    ]
+    PlayerConfig: [
+      {
+        class: com.csse3200.game.entities.configs.PlayerConfig
+        spritePath: images/player/player.atlas
+        position: {
+          x: 23
+          y: 25
+        }
+        health: 100
+        baseAttack: 10
+        lives: 3
+        sounds: {
+          soundsMap: {
+            low_health: sounds/playerLow_health.wav
+            dodge: sounds/dodgingAlertSweep.wav
+            boostPowerup: sounds/playerBoostRecharge.wav
+            healthPowerup: sounds/PlayerHealthRecharge.wav
+            footstep: sounds/footStepsInTheForestGround.wav
+            upgradeWeapon: sounds/upgradeWeapon.wav
+            upgradeTree: sounds/upgradeTreeTap.wav
+            exitbutton: sounds/ExitButton.wav,
+          }
+        }
+      }
+    ]
+  }
 }
diff --git a/source/core/assets/configs/powerups.json b/source/core/assets/configs/powerups.json
@@ -20,7 +20,7 @@
   },
 
   "tempImmunityPowerup": {
-    "spritePath": "images/powerups/invincibility_potion.png",
+    "spritePath": "images/powerups/temp_immunity.png",
     "type": "TEMP_IMMUNITY"
   },
 

diff --git a/source/core/assets/configs/shipUpgrades.json b/source/core/assets/configs/shipUpgrades.json
@@ -1,10 +1,10 @@
 {
   "healthUpgrade": {
-    "spritePath": "images/powerups/health_potion.png",
+    "spritePath": "images/powerups/health_boost.png",
     "type": "HEALTH_UPGRADE"
   },
   "fuelUpgrade": {
-    "spritePath": "images/powerups/speed_potion.png",
+    "spritePath": "images/powerups/speed_boost.png",
     "type": "FUEL_UPGRADE"
   }
 }