chore: adapt old code base to new architecture

.github/workflows/gradle-build.yml

@@ -2,13 +2,13 @@ name: Build & test project
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, development ]
     paths:
       - src/**
       - build.gradle
       - settings.gradle
   pull_request:
-    branches: [ master ]
+    branches: [ master, development ]
 
 concurrency: 
   group: ${{ github.workflow }}-${{ github.ref }}

configurations/config-1/locations/location-1/location-1.json

@@ -1,8 +1,8 @@
 {
   "tag": "location-1",
   "objects": [
-    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible" },
-    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "interactive" }
+    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible", "assetPath": "assets/someDude.png" },
+    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "dialog", "assetPath": "assets/someDude.png" }
   ],
-  "backgroundPath": "file:assets/map.png"
+  "backgroundPath": "assets/map.png"
 }

configurations/config-1/locations/location-1/objects/object-1.json

@@ -1,5 +1,9 @@
 {
   "tag": "object-1",
-  "assetPath": "/path/to/the/asset",
-  "type": ""
-}
+  "assetPath": "assets/someDude.png",
+  "type": "collectible",
+  "position": {
+    "row": 10,
+    "col": 10
+  }
+}

configurations/config-1/locations/location-1/objects/object-2.json

@@ -0,0 +1,6 @@
+{
+  "tag": "object-2",
+  "assetPath": "assets/stone.png",
+  "type": "navigable",
+  "position": { "row": 11, "col": 3 }
+}

configurations/config-1/locations/location-2/location-2.json

@@ -1,8 +1,8 @@
 {
   "tag": "location-2",
   "objects": [
-    { "tag": "object-1", "position": { "row": 0, "col": 0 }, "type": "collectible" },
-    { "tag": "object-3", "position": { "row": 0, "col": 1 }, "type": "navigable" }
+    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible", "assetPath": "assets/someDude.png" },
+    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "dialog", "assetPath": "assets/someDude.png" }
   ],
-  "backgroundPath": "file:assets/map.png"
-}
+  "backgroundPath": "assets/map.png"
+}

configurations/config-1/locations/location-2/objects/object-1.json

@@ -1,5 +1,9 @@
 {
   "tag": "object-1",
-  "assetPath": "/path/to/the/asset",
-  "type": ""
-}
+  "assetPath": "assets/stone.png",
+  "type": "dialog",
+  "position": {
+    "row": 1,
+    "col": 15
+  }
+}

configurations/config-1/locations/location-2/objects/object-3.json

@@ -1,5 +1,9 @@
 {
   "tag": "object-3",
-  "assetPath": "/path/to/the/asset",
-  "type": ""
-}
+  "assetPath": "assets/someDudeButGreen.png",
+  "type": "collectible",
+  "position": {
+    "row": 7,
+    "col": 8
+  }
+}

configurations/config-1/root.json

@@ -4,5 +4,12 @@
     "location-1",
     "location-2"
   ],
-  "rootLocation": "location-1"
-}
+  "rootLocation": "location-1",
+  "player": {
+    "tag": "player",
+    "position": { "row": 4, "col": 5 },
+    "type": "player",
+    "assetPath": "assets/stone.png",
+    "location": "location-1"
+  }
+}

configurations/demo-config-1/locations/location-1/location-1.json

@@ -0,0 +1,11 @@
+{
+  "tag": "location-1",
+  "objects": [
+    { "tag": "object-1", "position": { "row": 1, "col": 8 }, "type": "collectible", "assetPath": "assets/diamond.png" },
+    { "tag": "object-2", "position": { "row": 6, "col": 3 }, "type": "collectible", "assetPath": "assets/key.png" },
+    { "tag": "object-3", "position": { "row": 1, "col": 1 }, "type": "dialog", "assetPath": "assets/zombie.png" },
+    { "tag": "object-4", "position": { "row": 3, "col": 2 }, "type": "dialog", "assetPath": "assets/zombie.png" },
+    { "tag": "object-5", "position": { "row": 8, "col": 8 }, "type": "dialog", "assetPath": "assets/chest.png" }
+  ],
+  "backgroundPath": "assets/map.png"
+}

configurations/demo-config-1/root.json

@@ -0,0 +1,14 @@
+{
+  "tag": "GameByConfig1",
+  "locationTags": [
+    "location-1"
+  ],
+  "rootLocation": "location-1",
+  "player": {
+    "tag": "player",
+    "position": { "row": 4, "col": 5 },
+    "type": "player",
+    "assetPath": "assets/knight.png",
+    "location": "location-1"
+  }
+}

configurations/unit-test-configuration/locations/location-1/location-1.json → configurations/unit-test-configurations/test-config-1-full/locations/location-1/location-1.json

@@ -1,8 +1,8 @@
 {
   "tag": "location-1",
   "objects": [
-    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible" },
-    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "interactive" }
+    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible", "assetPath": "assets/someDude.png" },
+    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "dialog", "assetPath": "assets/someDude.png" }
   ],
-  "backgroundPath": "file:assets/map.png"
+  "backgroundPath": "assets/map.png"
 }

configurations/unit-test-configurations/test-config-1-full/locations/location-1/objects/object-1.json

@@ -0,0 +1,9 @@
+{
+  "tag": "object-1",
+  "assetPath": "assets/someDude.png",
+  "type": "collectible",
+  "position": {
+    "row": 10,
+    "col": 10
+  }
+}

configurations/unit-test-configurations/test-config-1-full/locations/location-1/objects/object-2.json

@@ -0,0 +1,6 @@
+{
+  "tag": "object-2",
+  "assetPath": "assets/stone.png",
+  "type": "navigable",
+  "position": { "row": 11, "col": 3 }
+}

configurations/unit-test-configurations/test-config-1-full/locations/location-2/location-2.json

@@ -0,0 +1,8 @@
+{
+  "tag": "location-2",
+  "objects": [
+    { "tag": "object-1", "position": { "row": 0, "col": 5 }, "type": "collectible", "assetPath": "assets/someDude.png" },
+    { "tag": "object-2", "position": { "row": 1, "col": 3 }, "type": "dialog", "assetPath": "assets/someDude.png" }
+  ],
+  "backgroundPath": "assets/map.png"
+}

configurations/unit-test-configurations/test-config-1-full/locations/location-2/objects/object-1.json

@@ -0,0 +1,9 @@
+{
+  "tag": "object-1",
+  "assetPath": "assets/stone.png",
+  "type": "dialog",
+  "position": {
+    "row": 1,
+    "col": 15
+  }
+}

configurations/unit-test-configurations/test-config-1-full/locations/location-2/objects/object-3.json

@@ -0,0 +1,9 @@
+{
+  "tag": "object-3",
+  "assetPath": "assets/someDudeButGreen.png",
+  "type": "collectible",
+  "position": {
+    "row": 7,
+    "col": 8
+  }
+}

configurations/unit-test-configurations/test-config-1-full/root.json

@@ -0,0 +1,15 @@
+{
+  "tag": "test-config-1-full",
+  "locationTags": [
+    "location-1",
+    "location-2"
+  ],
+  "rootLocation": "location-1",
+  "player": {
+    "tag": "player",
+    "position": { "row": 4, "col": 5 },
+    "type": "player",
+    "assetPath": "assets/stone.png",
+    "location": "location-1"
+  }
+}

src/main/java/io/rpg/Game.java

@@ -41,4 +41,8 @@ public Builder setController(Controller controller) {
       return this;
     }
   }
+
+  public Controller getController() {
+    return controller;
+  }
 }