Merge remote-tracking branch 'origin/feature/storyy' into feature/storyy

source/core/assets/configs/circle.json

@@ -0,0 +1,3 @@
+{
+  "spritePath": "images/npc/circle.png"
+}

source/core/assets/configs/landmine.json

@@ -5,5 +5,5 @@
   "baseAttack": 100,
   "damageRadius": 2.5,
   "chainRadius": 3,
-  "chainable": false,
+  "chainable": false
 }

source/core/assets/configs/weapons.json

@@ -18,9 +18,7 @@
 
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/slingshot.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/slingshot.wav"
       }
     }
   },
@@ -44,9 +42,7 @@
 
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/slingshot.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/slingshot.wav"
       }
     }
   },
@@ -69,9 +65,7 @@
 
     "sound": {
       "soundsMap": {
-        "start": "",
-        "mid": "sounds/weapons/boomerang.wav",
-        "end": ""
+        "start": "sounds/weapons/boomerang.wav"
       }
     }
   },
@@ -96,9 +90,7 @@
 
     "sound": {
       "soundsMap": {
-        "start": "",
-        "mid": "sounds/weapons/boomerang.wav",
-        "end": ""
+        "start": "sounds/weapons/boomerang.wav"
       }
     }
   },
@@ -122,9 +114,7 @@
     "attackCooldown": 150,
     "sound": {
       "soundsMap": {
-        "start": "",
-        "mid": "sounds/weapons/missile.wav",
-        "end": ""
+        "start": "sounds/weapons/missile.wav"
       }
     }
   },
@@ -146,9 +136,7 @@
     "attackCooldown": 45,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/nuke.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/nuke.wav"
       }
     },
     "ammoUse": 2
@@ -172,9 +160,7 @@
     "ammoUse": 30,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/nuke.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/nuke.wav"
       }
     }
   },
@@ -197,9 +183,7 @@
     "ammoUse": 2,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/missile.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/missile.wav"
       }
     }
   },
@@ -208,7 +192,7 @@
     "name": "Wrench",
     "description": "Its a wrench, what more to say.",
     "damage": 33,
-    "weaponSpeed": 4,
+    "weaponSpeed": 5,
     "weaponDuration": 26,
     "rotationSpeed": 1,
     "attackCooldown": 75,
@@ -221,9 +205,7 @@
     "ammoUse": 0,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/Katana.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/Katana.wav"
       }
     }
   },
@@ -245,9 +227,7 @@
     "ammoUse": 0,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/Katana.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/Katana.wav"
       }
     }
   },
@@ -270,9 +250,7 @@
     "projectiles": 8,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/beeStringKatana.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/beeStringKatana.wav"
       }
     }
   },
@@ -294,9 +272,7 @@
     "ammoUse": 3,
     "sound": {
       "soundsMap": {
-        "start": "sounds/weapons/laserSword.wav",
-        "mid": "",
-        "end": ""
+        "start": "sounds/weapons/laserSword.wav"
       }
     }
   },

source/core/assets/images/npc/Astronaut.atlas

@@ -3,112 +3,112 @@ size: 512, 32
 format: RGBA8888
 filter: Nearest, Nearest
 repeat: none
-Astro_Up
+row-1-column-1
   rotate: false
   xy: 0, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Up
+row-1-column-2
   rotate: false
   xy: 32, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Up
+row-1-column-3
   rotate: false
   xy: 64, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Up
+row-1-column-4
   rotate: false
   xy: 96, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Left
+row-2-column-1
   rotate: false
   xy: 128, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Left
+row-2-column-2
   rotate: false
   xy: 160, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Left
+row-2-column-3
   rotate: false
   xy: 192, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Left
+row-2-column-4
   rotate: false
   xy: 224, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Down
+row-3-column-1
   rotate: false
   xy: 256, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Down
+row-3-column-2
   rotate: false
   xy: 288, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Down
+row-3-column-3
   rotate: false
   xy: 320, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Down
+row-3-column-4
   rotate: false
   xy: 352, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Right
+row-4-column-1
   rotate: false
   xy: 384, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Right
+row-4-column-2
   rotate: false
   xy: 416, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Right
+row-4-column-3
   rotate: false
   xy: 448, 0
   size: 32, 32
   orig: 32, 32
   offset: 0, 0
   index: -1
-Astro_Right
+row-4-column-4
   rotate: false
   xy: 480, 0
   size: 32, 32

source/core/assets/kenney-rpg-expansion/kenneyrpg.json

@@ -253,7 +253,7 @@
       "titleFont": "thick_white"
     },
     "dialogue_7": {
-      "background": "dialogue_6",
+      "background": "dialogue_7",
       "titleFont": "thick_white"
     }
   }

source/core/assets/levels/blazes_refuge/main-area/main.json

@@ -25,7 +25,7 @@
     "images/upgradetree/exit.png",
     "images/companion/earth_Companion_spritesheet.png",
     "images/companion/Companion_spritesheet.png",
-    "images/companion/laboratory.png",
+    "images/companion/laboratoryinferno.png",
     "images/powerups/double_damage.png",
     "images/powerups/double_cross.png",
     "images/powerups/extra_life.png",
@@ -55,7 +55,8 @@
     "map/treetop.png",
     "particle-effects/explosion/particle.png",
     "images/resources/Cracked_Ground.png",
-    "images/enemy/botanist.png"
+    "images/enemy/botanist.png",
+    "images/companion/laboratoryinferno.png"
   ],
   "textureAtlasPaths": [
     "images/enemy/troll_enemy.atlas",

source/core/assets/levels/blazes_refuge/main_area/entities/circle.json

@@ -0,0 +1,13 @@
+{
+  "entityType": "CircleConfig",
+  "entities": [
+    {
+      class: com.csse3200.game.entities.configs.CircleConfig,
+      "spritePath": "images/npc/circle.png",
+      "position" : {
+        "x": 28,
+        "y": 57
+      }
+    }
+  ]
+}

source/core/assets/levels/blazes_refuge/main_area/entities/companion.json

@@ -2,7 +2,7 @@
   "entityType": "CompanionConfig",
   "entities": [
     {
-      "class": com.csse3200.game.entities.configs.CompanionConfig,
+      "class": "com.csse3200.game.entities.configs.CompanionConfig",
        "position": {
           "x": 10,
           "y": 50

source/core/assets/levels/tutorial/main_area/entities/fissures.json → source/core/assets/levels/blazes_refuge/main_area/entities/fissures.json

@@ -5,24 +5,24 @@
       "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Solstite",
       "position": {
-        "x": 34,
-        "y": 34
+        "x": 51,
+        "y": 18
       }
     },
     {
       "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Nebulite",
       "position": {
-        "x": 40,
-        "y": 34
+        "x": 21,
+        "y": 5
       }
     },
     {
       "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Durasteel",
       "position": {
-        "x": 46,
-        "y": 34
+        "x": 80,
+        "y": 64
       }
     }
   ]