Transition to tiled (#219)

* resize images to 70x70 * add first map * add test world * add walk way * add more houses * new map
Gdevelop-game · May 4, 2024 · af8fccf · af8fccf
1 parent f3f899e
commit af8fccf
Show file tree

Hide file tree

Showing 51 changed files with 42,534 additions and 13,666 deletions.
diff --git a/src/assets/environment/foliage/grass/grass_1.png b/src/assets/environment/foliage/grass/grass_1.png
diff --git a/src/assets/environment/foliage/grass/grass_2.png b/src/assets/environment/foliage/grass/grass_2.png
diff --git a/src/assets/environment/foliage/grass/grass_3.png b/src/assets/environment/foliage/grass/grass_3.png
diff --git a/src/assets/environment/foliage/grass/grass_4.png b/src/assets/environment/foliage/grass/grass_4.png
diff --git a/src/assets/environment/map/city1.json b/src/assets/environment/map/city1.json
@@ -0,0 +1,73 @@
+{ "compressionlevel":-1,
+ "height":300,
+ "infinite":false,
+ "layers":[
+        {
+         "compression":"zlib",
+         "data":"eJzt3V1O3DAUhmHvpteg\/tEfZIm26+jSWApL64wKqhUV8AyZnOP4eaTvtmVE88qCJC0FAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIhwddh1sr2\/6CcGRvXlsJ\/J9uGinxgYlV4Bo9ArYBR6BYxCr2AffpRyf5dgh6\/jYc3P1f5OsB7+7Og+6RW83aEV5XuC3a3cq9sS36SX9nHNDwuT2GOvjmermvBMpVfwNnvsVfazlV7BefRKr2AUx2t76zb97\/q91SvgFVv26tcLq6X8XuvZvJr8Z1d6Bed5S6+ir\/mR534GON2pvYq+zvcyvSLaGu8t2fo9I729ir6+9za9Itoaz31s\/e+45\/eD0df2HqdXRNtbr6Kv6T1Pr4g2Yq9uSrmPvnZnnF4RbcReZXx3wQzTK6LplWX9PsOSXlnW7zMs6ZVl\/T7D0hrXfl3xuZS9PLuyx+kV0ZxVrHd6RTS9st7pFdH0ynqnV0TTK+udXhFNr6x3ekU0vbLe6RXR9Mp6p1dE0yvrnV4RTa+sd3pFNL2y3ukV0fTKeqdXRNMr651eEU2vrHd6RTS9st7pFdH0ynqnV0TTK+udXhFNr6x3ekU0vbLe6RXR9Mp6p1dE0ytrVw\/79Mw+F4ilV9bOGYrM9Cp+7x4X\/XUcp1dkplfWTq\/ITK+snV6RmV5ZO70iM72ydnpFZnpl7fSKzPTK2ukVmemVtdMrMtMra6dXZKZX1k6vyEyvrJ1ekZleWTu9IjO9snZ6RWZ6Ze30isz0ytrpFZnplbXTKzLTqzlWy\/PvDX3aTfEOUXLTqznm3MQe6NUc0yv2QK\/mmF4R5eqw65VWS3mIvpZMr9gvZyI7dXpFFL2yU6dXRNErO3V6RRS9slOnV0TRKzt1ekUUvbLlavl7f\/pzc986UfTKlnN+Iiu9suX0iqz0ypbTK7LSK1tOr8hKr2w5vSIrvbLl9Iqs9MqW0yuy0itbTq\/ISq9sOb0iK72y5fSKrPRq3NXy+v\/7cM48b0NWejXunIOYjV6NO71iNno17vSK2ejVuNMrZqNX406vmI1ejTu9YjZ6Ne70itno1bjTK2ajV+NOr5iNXo07vWI2ejXu9IrZ6NW40ytmo1fjTq+YjV6NO71iNno17vSK2Xwrl3mH0nG1lPvoa\/pp9YKfM2reUwXryXR2cxYBXvL1sJvH1aCzVn38+51FgF5RZy3nKuBUUb36uMWHA3ZFr4BR6BUwCr0CRqFXwCi27FUt7qkEzneJXtXy7\/6udhoFvMUleuXeKuASjve6r\/1soV4BWzj3vFWLn00B2zq3V85UwNbaZ6G9QwUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMbyB1yd4YU=",
+         "encoding":"base64",
+         "height":300,
+         "id":1,
+         "locked":true,
+         "name":"edge",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":300,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "compression":"zlib",
+         "data":"eJzt3V1O20AUgFE\/tvwEHlEB8QAChGAZ3QdLzdJqCK3CNBMnzow9NzpHulLjGmIi+ZNB46TrAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACI7vdMA7AvfQKi0B8gCo0CotArIAqdAqLQKYAyLvo52TKX8x0awDc\/+nndMqfzHRrAN3oFRJH26qXTK6BNaa+ukseLrlv2zXqfc\/wNDfgw1KsWxjUe8EGvgCj0CohCr4Ao9AqIYqhXZ6t93uec29leHaAlQ71ybQPlDN3\/VmLOC0yra4j0CqYzdD9JK9Pqea9XMB292k3u\/Wv0CqYzZ68eMts2bW\/1vNcrmM4UvdrUH70C9uX3wcPoFUxHrw6jVzCdXK\/O+rkbMYvM99Mr4FC5Xo09zzZ9v\/Q97LZtz+3b6nmvVzCdKXqVu6du0\/bcvq2e93oF09Grw+gVTOdYenXbdcu7galxr9H1wPEvvp5323G1eq8RtKbFXo1Zf9X\/\/3LTc0w9j8njtfVky9y4BoPd6FXd0Ssop8VejTkevYLjN0Wv0t+Rtm3P7btvr97W\/v3cz03Feco872uyz99uva216mGHnw1YmaJXJcb1FVC6V\/fduHXxQzP0nr56BcevdK\/mkvYqt06+hV496hWMcqy9Sv9uf71a61Tl2m\/bnPTP+3VP5b8+XekVjHIsvWp5nflp0ie9gnH0qr6hXvXHvpzx8CAMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvapPr6AMvarv5+oY9AoOpFf16RWUoVf16RWUoVf16RWUoVf16RWUoVf16RWUoVf16RWUoVf1peuvXvQKRtGr+tJepaNXsBu9qk+voIxcr371c\/41d93nZ2Fl56T7\/NyqWee6a7dXl6vXKDsXegU7qfX58XPPY\/I42vUi8L9j7VU6egXx6RUQxXqvnvu52TBPa\/u87bD\/XJM7Tr2C4+D6CohCr4Ao9u3Vy577tzJ6BfHdd5\/rq7Kz6L6f9+m6prOBr29lbku9YECzWl43DrBOr4Ao9AqIQq+AKPQKiEKvgCj0CohCr4Ao9AqIQq+AKPQKiEKvgCj0CohCr4Ao9AqIQq+AKPQKiEKvgCj0CohCr4Ao9AqIQq+AKPQKiEKvgCj0CohCr4Ao9AqIQq+AKPQKiEKvgCj0CohCr4Ao9AqIQq+AKPQKAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACA2v4A7Pip+A==",
+         "encoding":"base64",
+         "height":300,
+         "id":4,
+         "locked":true,
+         "name":"road",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":300,
+         "x":0,
+         "y":0
+        }, 
+        {
+         "compression":"zlib",
+         "data":"eJzt3UtOAzEQRdGsCNgE+98SE5CiZEJ3u9r17HMkiwmJqlB8hRQ+jwcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAM8+wg+wj9m9uaNXny\/niCuPBcb6u\/ev93LGOdIgvYL96FXdY4GxXns1w5VedTjAPfRKryBFaq86SJsX0unVeWnzQjq9Oi9tXkinV+elzQvp9Oq8tHkhnV6dlzYvPJv9vvqVo1fHpc0Lz2Y3Z6dezf56PR9IlPj61Su9Yk+Jr9\/0XlXz+4OsSq+O+f79qFdwP706R6\/gfnp1TudewaoS75BewZ4S75BewZ4S79Brr1b8+6LAu\/\/coW4\/36NXsKfkXnU6o+cG3h3p1ajnu2p2m\/QK5litV+lW2QMq6FUvq+wBFfSql1X2gAp61csqe0AFvepllT2ggl71ssoeUEGvelllD6hQ1atZJ90qe0AFvepllT2gwuhezZLQ1NF7wG70Sq8gxc69ukvn2SCJXtXrPBsk0at6nWeDJHpVr\/NskESv6nWeDZLoVb3Os0ESvarXeTZIolc1rv5PCv+fGd7pVQ29gvH0qoZewXh6VUOvYDy9qtd5NkiiV\/U6zwZJ9Kpe59kgiV7V6zwbJNGrep1ngyR6Va\/zbJBEr+p1ng2SHOlVwhm180idZ4MkelWv82yQZMf7oVeQacf7MatXo79PhN3seD\/+dr7rd\/T0CsbY8X7c3StgDL3SK0ihV3oFKXbuFZBlx7u7486wgh3v7o47wwoqfm485QBZ9ApYxZle\/dfnY\/x7dBXPCWTQKyCFXgEpKnsFMJJeASn0CkihV0AKvQJS6BWQQq+AFHoFpNArIIVeASn0CkihV0AKvQJS6BWQQq+AFHoFpNArIIVeASn0CkihV0AKvQJS6BWQQq+AFHoFpNArIMXX7xn9uQCj6RWQQq8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDTD6JhPgM=",
+         "encoding":"base64",
+         "height":300,
+         "id":7,
+         "name":"path",
+         "opacity":1,
+         "type":"tilelayer",
+         "visible":true,
+         "width":300,
+         "x":0,
+         "y":0
+        }],
+ "nextlayerid":8,
+ "nextobjectid":1,
+ "orientation":"orthogonal",
+ "renderorder":"right-down",
+ "tiledversion":"1.10.2",
+ "tileheight":70,
+ "tilesets":[
+        {
+         "columns":72,
+         "firstgid":1,
+         "image":"city1\/spritesheet.png",
+         "imageheight":71,
+         "imagewidth":5040,
+         "margin":0,
+         "name":"spritesheet",
+         "spacing":0,
+         "tilecount":72,
+         "tileheight":70,
+         "tilewidth":70
+        }],
+ "tilewidth":70,
+ "type":"map",
+ "version":"1.10",
+ "width":300
+}
diff --git a/src/assets/environment/map/city1/spritesheet.png b/src/assets/environment/map/city1/spritesheet.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_1.png b/src/assets/environment/tile/map_edge/map_edge_1.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_10.png b/src/assets/environment/tile/map_edge/map_edge_10.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_11.png b/src/assets/environment/tile/map_edge/map_edge_11.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_12.png b/src/assets/environment/tile/map_edge/map_edge_12.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_13.png b/src/assets/environment/tile/map_edge/map_edge_13.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_14.png b/src/assets/environment/tile/map_edge/map_edge_14.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_15.png b/src/assets/environment/tile/map_edge/map_edge_15.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_16.png b/src/assets/environment/tile/map_edge/map_edge_16.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_17.png b/src/assets/environment/tile/map_edge/map_edge_17.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_18.png b/src/assets/environment/tile/map_edge/map_edge_18.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_19.png b/src/assets/environment/tile/map_edge/map_edge_19.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_2.png b/src/assets/environment/tile/map_edge/map_edge_2.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_20.png b/src/assets/environment/tile/map_edge/map_edge_20.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_3.png b/src/assets/environment/tile/map_edge/map_edge_3.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_4.png b/src/assets/environment/tile/map_edge/map_edge_4.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_5.png b/src/assets/environment/tile/map_edge/map_edge_5.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_6.png b/src/assets/environment/tile/map_edge/map_edge_6.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_7.png b/src/assets/environment/tile/map_edge/map_edge_7.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_8.png b/src/assets/environment/tile/map_edge/map_edge_8.png
diff --git a/src/assets/environment/tile/map_edge/map_edge_9.png b/src/assets/environment/tile/map_edge/map_edge_9.png
diff --git a/src/assets/environment/tile/path/concrete.png b/src/assets/environment/tile/path/concrete.png
diff --git a/src/assets/environment/tile/path/dirt.png b/src/assets/environment/tile/path/dirt.png
diff --git a/src/assets/environment/tile/path/sand.png b/src/assets/environment/tile/path/sand.png
diff --git a/src/externalEvents/appconnection.json b/src/externalEvents/appconnection.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "AppConnection",
   "events": [

diff --git a/src/externalEvents/crosshair.json b/src/externalEvents/crosshair.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Crosshair",
   "events": [

diff --git a/src/externalEvents/debug.json b/src/externalEvents/debug.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Debug",
   "events": [
@@ -161,6 +161,30 @@
               ]
             }
           ]
+        },
+        {
+          "type": "BuiltinCommonInstructions::Standard",
+          "conditions": [
+            {
+              "type": {
+                "value": "DepartScene"
+              },
+              "parameters": [
+                ""
+              ]
+            }
+          ],
+          "actions": [
+            {
+              "type": {
+                "value": "Delete"
+              },
+              "parameters": [
+                "props_fences",
+                ""
+              ]
+            }
+          ]
         }
       ],
       "parameters": []

diff --git a/src/externalEvents/doors.json b/src/externalEvents/doors.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Doors",
   "events": [

diff --git a/src/externalEvents/foliage.json b/src/externalEvents/foliage.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Foliage",
   "events": [

diff --git a/src/externalEvents/game.json b/src/externalEvents/game.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Game",
   "events": [

diff --git a/src/externalEvents/godmode.json b/src/externalEvents/godmode.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "GodMode",
   "events": [

diff --git a/src/externalEvents/houses.json b/src/externalEvents/houses.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Houses",
   "events": []

diff --git a/src/externalEvents/phone.json b/src/externalEvents/phone.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Phone",
   "events": [

diff --git a/src/externalEvents/player.json b/src/externalEvents/player.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Player",
   "events": [

diff --git a/src/externalEvents/sea.json b/src/externalEvents/sea.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Sea",
   "events": [

diff --git a/src/externalEvents/sports.json b/src/externalEvents/sports.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "Sports",
   "events": [

diff --git a/src/externalEvents/weaponbar.json b/src/externalEvents/weaponbar.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "lastChangeTimeStamp": 0,
   "name": "WeaponBar",
   "events": [

diff --git a/src/externalLayouts/city2.json b/src/externalLayouts/city2.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "name": "City2",
   "instances": [
     {

diff --git a/src/externalLayouts/phone.json b/src/externalLayouts/phone.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "name": "Phone",
   "instances": [
     {

diff --git a/src/externalLayouts/weaponbar.json b/src/externalLayouts/weaponbar.json
@@ -1,5 +1,5 @@
 {
-  "associatedLayout": "Game_World",
+  "associatedLayout": "Game_World_old",
   "name": "WeaponBar",
   "instances": [
     {

diff --git a/src/game.json b/src/game.json
@@ -2441,6 +2441,23 @@
         "name": "assets/weapon/ammo/ammo_uzi.png",
         "smoothed": true,
         "userAdded": true
+      },
+      {
+        "disablePreload": false,
+        "file": "assets/environment/map/city1.json",
+        "kind": "tilemap",
+        "metadata": "",
+        "name": "assets/environment/map/city1.json",
+        "userAdded": true
+      },
+      {
+        "alwaysLoaded": false,
+        "file": "assets/environment/map/city1/spritesheet.png",
+        "kind": "image",
+        "metadata": "",
+        "name": "assets/environment/map/city1/spritesheet.png",
+        "smoothed": true,
+        "userAdded": true
       }
     ],
     "resourceFolders": []
@@ -2713,6 +2730,10 @@
       "__REFERENCE_TO_SPLIT_OBJECT": true,
       "referenceTo": "/layouts/game_customisation_wip"
     },
+    {
+      "__REFERENCE_TO_SPLIT_OBJECT": true,
+      "referenceTo": "/layouts/game_world_old"
+    },
     {
       "__REFERENCE_TO_SPLIT_OBJECT": true,
       "referenceTo": "/layouts/game_world"

diff --git a/src/layouts/game_customisation_wip.json b/src/layouts/game_customisation_wip.json
@@ -1922,7 +1922,7 @@
           },
           "parameters": [
             "",
-            "\"Game_World\"",
+            "\"Game_World_old\"",
             ""
           ]
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -1922,7 +1922,7 @@ @@
               },
               "parameters": [
                 "",
-                "\"Game_World\"",
+                "\"Game_World_old\"",
                 ""
               ]
             }
@@ Expand Down @@