Merge pull request #557 from UQcsse3200/feature/map

Feature/map
UQcsse3200 · Oct 19, 2023 · 518c345 · 518c345
2 parents 070a8fd + 0ee0a9d
commit 518c345
Show file tree

Hide file tree

Showing 47 changed files with 154 additions and 100 deletions.
diff --git a/source/core/assets/images/entity/Campfire.atlas b/source/core/assets/images/entity/Campfire.atlas
@@ -0,0 +1,33 @@
+Campfire.png
+size: 768, 192
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+Flicker
+  rotate: false
+  xy: 0, 0
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+Flicker
+  rotate: false
+  xy: 192, 0
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+Flicker
+  rotate: false
+  xy: 384, 0
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
+Flicker
+  rotate: false
+  xy: 576, 0
+  size: 192, 192
+  orig: 192, 192
+  offset: 0, 0
+  index: -1
diff --git a/source/core/assets/images/entity/Campfire.png b/source/core/assets/images/entity/Campfire.png
diff --git a/source/core/assets/levels/blazes_refuge/main_area/entities/laboratoryinferno.json b/source/core/assets/levels/blazes_refuge/main_area/entities/laboratoryinferno.json
@@ -2,7 +2,7 @@
   "entityType": "LaboratoryConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.LaboratoryConfig,
+      "class": "com.csse3200.game.entities.configs.LaboratoryConfig",
       "spritePath": "images/companion/laboratoryinferno.png",
       "position": {"x":34,
         "y": 49

diff --git a/source/core/assets/levels/blazes_refuge/main_area/entities/player.json b/source/core/assets/levels/blazes_refuge/main_area/entities/player.json
@@ -2,9 +2,9 @@
   "entityType": "PlayerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PlayerConfig,
+      "class": "com.csse3200.game.entities.configs.PlayerConfig",
       "position": {
-        "x": 10,
+        "x": 20,
         "y": 40
       },
       "health": 100,

diff --git a/source/core/assets/levels/blazes_refuge/main_area/entities/portals.json b/source/core/assets/levels/blazes_refuge/main_area/entities/portals.json
@@ -2,7 +2,7 @@
   "entityType": "PortalConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PortalConfig,
+      "class": "com.csse3200.game.entities.configs.PortalConfig",
       "teleportX" : 40,
       "teleportY" : 10,
       "position": {
@@ -11,7 +11,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PortalConfig,
+      "class": "com.csse3200.game.entities.configs.PortalConfig",
       "teleportX" : 16,
       "teleportY" : 20,
       "position": {

diff --git a/source/core/assets/levels/blazes_refuge/main_area/entities/safezone.json b/source/core/assets/levels/blazes_refuge/main_area/entities/safezone.json
@@ -2,8 +2,8 @@
   "entityType": "SafeZoneConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.SafeZoneConfig,
-      "spritePath":  "map/coolzone.png",
+      "class": "com.csse3200.game.entities.configs.SafeZoneConfig",
+      "spritePath":  "map/Coolzone.atlas",
       "position": {
         "x": 25,
         "y": 67

diff --git a/source/core/assets/levels/blazes_refuge/main_area/entities/ship.json b/source/core/assets/levels/blazes_refuge/main_area/entities/ship.json
@@ -2,7 +2,7 @@
   "entityType": "ShipConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.ShipConfig,
+      "class": "com.csse3200.game.entities.configs.ShipConfig",
       "spritePath": "images/ship/Ship.png",
       "position": {
         "x": 33,

diff --git a/source/core/assets/levels/blazes_refuge/main_area/entities/spawners.json b/source/core/assets/levels/blazes_refuge/main_area/entities/spawners.json
@@ -2,7 +2,7 @@
   "entityType": "SpawnerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.SpawnerConfig,
+      "class": "com.csse3200.game.entities.configs.SpawnerConfig",
       "wave1" : {
         "redGhost" : 30,
         "roboMan" : 30,

diff --git a/source/core/assets/levels/controls/main_area/entities/fissures.json b/source/core/assets/levels/controls/main_area/entities/fissures.json
@@ -2,23 +2,23 @@
   "entityType": "FissureConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.FissureConfig,
+      "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Solstite",
       "position": {
         "x": 34,
         "y": 34
       }
     },
     {
-      class: com.csse3200.game.entities.configs.FissureConfig,
+      "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Nebulite",
       "position": {
         "x": 40,
         "y": 34
       }
     },
     {
-      class: com.csse3200.game.entities.configs.FissureConfig,
+      "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Durasteel",
       "position": {
         "x": 46,

diff --git a/source/core/assets/levels/controls/main_area/entities/player.json b/source/core/assets/levels/controls/main_area/entities/player.json
@@ -2,7 +2,7 @@
   "entityType": "PlayerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PlayerConfig,
+      "class": "com.csse3200.game.entities.configs.PlayerConfig",
       "position": {
         "x": 30,
         "y": 70

diff --git a/source/core/assets/levels/controls/main_area/entities/spawners.json b/source/core/assets/levels/controls/main_area/entities/spawners.json
@@ -2,7 +2,7 @@
   "entityType": "SpawnerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.SpawnerConfig,
+      "class": "com.csse3200.game.entities.configs.SpawnerConfig",
       "wave1" : [
         1,
         1,

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/astronaut.json b/source/core/assets/levels/cryoheim/main_area/entities/astronaut.json
@@ -2,7 +2,7 @@
   "entityType": "AstronautConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.AstronautConfig,
+      "class": "com.csse3200.game.entities.configs.AstronautConfig",
       "spritePath": "images/npc/astronaut_npc.atlas",
       "position" : {
         "x": 15,

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/botanist.json b/source/core/assets/levels/cryoheim/main_area/entities/botanist.json
@@ -2,7 +2,7 @@
   "entityType": "BotanistConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.BotanistConfig,
+      "class": "com.csse3200.game.entities.configs.BotanistConfig",
       "spritePath": "images/botanist.atlas",
       "position" : {
         "x": 20,

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/hellman.json b/source/core/assets/levels/cryoheim/main_area/entities/hellman.json
@@ -2,7 +2,7 @@
   "entityType": "HellmanConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.HellmanConfig,
+      "class": "com.csse3200.game.entities.configs.HellmanConfig",
       "spritePath": "images/npc/Hellman.atlas",
       "position" : {
         "x": 25,

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/player.json b/source/core/assets/levels/cryoheim/main_area/entities/player.json
@@ -2,7 +2,7 @@
   "entityType": "PlayerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PlayerConfig,
+      "class": "com.csse3200.game.entities.configs.PlayerConfig",
       "position": {
         "x": 20,
         "y": 40

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/portals.json b/source/core/assets/levels/cryoheim/main_area/entities/portals.json
@@ -2,7 +2,7 @@
   "entityType": "PortalConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PortalConfig,
+      "class": "com.csse3200.game.entities.configs.PortalConfig",
       "teleportX" : 40,
       "teleportY" : 5,
       "position": {
@@ -11,7 +11,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PortalConfig,
+      "class": "com.csse3200.game.entities.configs.PortalConfig",
       "teleportX" : 16,
       "teleportY" : 20,
       "position": {

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/safezone.json b/source/core/assets/levels/cryoheim/main_area/entities/safezone.json
@@ -2,8 +2,8 @@
   "entityType": "SafeZoneConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.SafeZoneConfig,
-      "spritePath":  "map/heatzone.png",
+      "class": "com.csse3200.game.entities.configs.SafeZoneConfig",
+      "spritePath":  "images/entity/Campfire.atlas",
       "position": {
         "x": 25,
         "y": 67

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/ship.json b/source/core/assets/levels/cryoheim/main_area/entities/ship.json
@@ -2,7 +2,7 @@
   "entityType": "ShipConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.ShipConfig,
+      "class": "com.csse3200.game.entities.configs.ShipConfig",
       "spritePath": "images/ship/Ship.png",
       "position": {
         "x": 33,

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/spawners.json b/source/core/assets/levels/cryoheim/main_area/entities/spawners.json
@@ -2,7 +2,7 @@
   "entityType": "SpawnerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.SpawnerConfig,
+      "class": "com.csse3200.game.entities.configs.SpawnerConfig",
       "wave1" : {
         "redGhost" : 10,
         "roboMan" : 10,

diff --git a/source/core/assets/levels/cryoheim/main_area/entities/treeTop.json b/source/core/assets/levels/cryoheim/main_area/entities/treeTop.json
@@ -2,7 +2,7 @@
   "entityType": "TreeTopConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.TreeTopConfig,
+      "class": "com.csse3200.game.entities.configs.TreeTopConfig",
       "position": {
         "x": 0,
         "y": 0

diff --git a/source/core/assets/levels/earth/main_area/entities/astro.json b/source/core/assets/levels/earth/main_area/entities/astro.json
@@ -2,7 +2,7 @@
   "entityType": "AstroConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.AstroConfig,
+      "class": "com.csse3200.game.entities.configs.AstroConfig",
       "spritePath": "images/npc/Astro_NPC.atlas",
       "position" : {
         "x": 24,

diff --git a/source/core/assets/levels/earth/main_area/entities/companion.json b/source/core/assets/levels/earth/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

diff --git a/source/core/assets/levels/earth/main_area/entities/fissures.json b/source/core/assets/levels/earth/main_area/entities/fissures.json
@@ -2,23 +2,23 @@
   "entityType": "FissureConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.FissureConfig,
+      "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Solstite",
       "position": {
         "x": 34,
         "y": 34
       }
     },
     {
-      class: com.csse3200.game.entities.configs.FissureConfig,
+      "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Nebulite",
       "position": {
         "x": 40,
         "y": 34
       }
     },
     {
-      class: com.csse3200.game.entities.configs.FissureConfig,
+      "class": "com.csse3200.game.entities.configs.FissureConfig",
       "resource": "Durasteel",
       "position": {
         "x": 46,

diff --git a/source/core/assets/levels/earth/main_area/entities/jail.json b/source/core/assets/levels/earth/main_area/entities/jail.json
@@ -2,7 +2,7 @@
   "entityType": "JailConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.JailConfig,
+      "class": "com.csse3200.game.entities.configs.JailConfig",
       "spritePath": "images/Jail/jail.atlas",
       "position" : {
         "x": 24,

diff --git a/source/core/assets/levels/earth/main_area/entities/laboratory.json b/source/core/assets/levels/earth/main_area/entities/laboratory.json
@@ -2,7 +2,7 @@
   "entityType": "LaboratoryConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.LaboratoryConfig,
+      "class": "com.csse3200.game.entities.configs.LaboratoryConfig",
       "spritePath": "images/companion/laboratory.png",
       "position": {"x":34,
         "y": 49

diff --git a/source/core/assets/levels/earth/main_area/entities/player.json b/source/core/assets/levels/earth/main_area/entities/player.json
@@ -2,7 +2,7 @@
   "entityType": "PlayerConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PlayerConfig,
+      "class": "com.csse3200.game.entities.configs.PlayerConfig",
       "position": {
         "x": 10,
         "y": 40

diff --git a/source/core/assets/levels/earth/main_area/entities/portals.json b/source/core/assets/levels/earth/main_area/entities/portals.json
@@ -2,7 +2,7 @@
   "entityType": "PortalConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PortalConfig,
+      "class": "com.csse3200.game.entities.configs.PortalConfig",
       "teleportX" : 40,
       "teleportY" : 5,
       "position": {
@@ -11,7 +11,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PortalConfig,
+      "class": com.csse3200.game.entities.configs.PortalConfig,
       "teleportX" : 16,
       "teleportY" : 20,
       "position": {

diff --git a/source/core/assets/levels/earth/main_area/entities/secretpower.json b/source/core/assets/levels/earth/main_area/entities/secretpower.json
@@ -2,7 +2,7 @@
   "entityType": "PowerupConfig",
   "entities": [
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/health_boost.png",
       "spritePath": "images/powerups/health_boost.png",
       "type": "HEALTH_BOOST",
@@ -12,7 +12,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/extra_life.png",
       "spritePath": "images/powerups/extra_life.png",
       "type": "EXTRA_LIFE",
@@ -22,7 +22,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/speed_boost.png",
       "spritePath": "images/powerups/speed_boost.png",
       "type": "SPEED_BOOST",
@@ -32,7 +32,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/double_cross.png",
       "spritePath": "images/powerups/double_cross.png",
       "type": "DOUBLE_CROSS",
@@ -42,7 +42,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/temp_immunity.png",
       "spritePath": "images/powerups/temp_immunity.png",
       "type": "TEMP_IMMUNITY",
@@ -52,7 +52,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/double_damage.png",
       "spritePath": "images/powerups/double_damage.png",
       "type": "DOUBLE_DAMAGE",
@@ -62,7 +62,7 @@
       }
     },
     {
-      class: com.csse3200.game.entities.configs.PowerupConfig,
+      "class": "com.csse3200.game.entities.configs.PowerupConfig",
       "imagePath": "images/powerups/snap.png",
       "spritePath": "images/powerups/snap.png",
       "type": "SNAP",