Forráskód Böngészése

Furnitures and map changes

Myval5773 2 hónapja
szülő
commit
a044d1fb74

BIN
INDPRO/Game/Optilox's Gameboy Assets/Parts_Doors.png


BIN
INDPRO/Game/Optilox's Gameboy Assets/Parts_Roofing.png


BIN
INDPRO/Game/Silent Specter/SilentSpecter/assets/backgrounds/House_v2.png


+ 12 - 0
INDPRO/Game/Silent Specter/SilentSpecter/project/backgrounds/house_v2.gbsres

@@ -0,0 +1,12 @@
+{
+  "_resourceType": "background",
+  "id": "e776f158-1a9a-41a5-98c3-489693629b3a",
+  "name": "House_v2",
+  "symbol": "bg_house_v2",
+  "width": 125,
+  "height": 58,
+  "imageWidth": 1000,
+  "imageHeight": 464,
+  "filename": "House_v2.png",
+  "tileColors": ""
+}

+ 50 - 11
INDPRO/Game/Silent Specter/SilentSpecter/project/prefabs/actors/scaredghost.gbsres

@@ -90,7 +90,7 @@
     {
       "command": "EVENT_WAIT",
       "args": {
-        "time": 1,
+        "time": 0.5,
         "frames": 30
       },
       "id": "a21ed51b-4d6c-4300-9a5c-57886c410182"
@@ -105,9 +105,45 @@
           "value": 10
         },
         "otherActorId": "$self$",
-        "__collapseElse": true,
+        "__collapseElse": false,
         "__collapse": false
       },
+      "children": {
+        "true": [
+          {
+            "command": "EVENT_SET_VALUE",
+            "args": {
+              "variable": "L1",
+              "value": {
+                "type": "true"
+              }
+            },
+            "id": "2b765ef3-efb0-4ae0-90ac-c9d0d3b4cd6d"
+          }
+        ],
+        "false": [
+          {
+            "command": "EVENT_SET_VALUE",
+            "args": {
+              "variable": "L1",
+              "value": {
+                "type": "false"
+              }
+            },
+            "id": "24d4dcea-ce18-4adc-890b-dd6759978437"
+          }
+        ]
+      },
+      "id": "c2f0cdcc-f9e9-49bf-8d9c-f62a542f1eb7"
+    },
+    {
+      "command": "EVENT_LOOP_WHILE",
+      "args": {
+        "condition": {
+          "type": "variable",
+          "value": "L1"
+        }
+      },
       "children": {
         "true": [
           {
@@ -163,14 +199,16 @@
                           },
                           "moveType": "horizontal",
                           "useCollisions": true,
-                          "__comment": true
+                          "__comment": true,
+                          "__collapse": true
                         },
                         "id": "ddd0a62c-3fde-49c6-8ef8-bba024330df8"
                       },
                       {
                         "command": "EVENT_ACTOR_PUSH",
                         "args": {
-                          "continue": true
+                          "continue": true,
+                          "__collapse": false
                         },
                         "id": "23334933-bd00-4ae1-a3b0-b2de1a33850f"
                       }
@@ -186,8 +224,9 @@
                             "property": "pxpos"
                           },
                           "y": {
-                            "type": "number",
-                            "value": 0
+                            "type": "property",
+                            "target": "player",
+                            "property": "pypos"
                           },
                           "moveType": "horizontal",
                           "useCollisions": true
@@ -259,8 +298,9 @@
                             "property": "pxpos"
                           },
                           "y": {
-                            "type": "number",
-                            "value": 0
+                            "type": "property",
+                            "target": "player",
+                            "property": "pypos"
                           },
                           "moveType": "horizontal",
                           "useCollisions": true
@@ -275,10 +315,9 @@
             },
             "id": "f9212125-f118-419b-b8e3-adf44e6490da"
           }
-        ],
-        "false": []
+        ]
       },
-      "id": "c2f0cdcc-f9e9-49bf-8d9c-f62a542f1eb7"
+      "id": "9f89963c-79e8-4f3b-b9e4-74b416c1dd3b"
     }
   ],
   "hit1Script": [],

+ 3 - 3
INDPRO/Game/Silent Specter/SilentSpecter/project/scenes/maps/house/actors/actor.gbsres

@@ -28,7 +28,7 @@
   "hit1Script": [],
   "hit2Script": [],
   "hit3Script": [],
-  "x": 14,
-  "y": 101,
-  "_index": 1
+  "x": 0,
+  "y": 1,
+  "_index": 0
 }

+ 0 - 46
INDPRO/Game/Silent Specter/SilentSpecter/project/scenes/maps/house/actors/actor_2.gbsres

@@ -1,46 +0,0 @@
-{
-  "_resourceType": "actor",
-  "id": "09ee472c-a460-4f1d-bedc-034cf674d494",
-  "name": "",
-  "frame": 0,
-  "animate": false,
-  "spriteSheetId": "581d34d0-9591-4e6e-a609-1d94f203b0cd",
-  "prefabId": "aa85a6c2-7d1b-4e7c-b0ff-d029b9ec31b7",
-  "direction": "left",
-  "moveSpeed": 1,
-  "animSpeed": 15,
-  "paletteId": "",
-  "isPinned": false,
-  "persistent": false,
-  "collisionGroup": "",
-  "prefabScriptOverrides": {
-    "c2f0cdcc-f9e9-49bf-8d9c-f62a542f1eb7": {
-      "id": "c2f0cdcc-f9e9-49bf-8d9c-f62a542f1eb7",
-      "args": {
-        "__collapseElse": false
-      }
-    },
-    "4c1b2cec-0f74-48dc-a84c-e3a32a991f51": {
-      "id": "4c1b2cec-0f74-48dc-a84c-e3a32a991f51",
-      "args": {
-        "__collapseElse": true
-      }
-    },
-    "f9212125-f118-419b-b8e3-adf44e6490da": {
-      "id": "f9212125-f118-419b-b8e3-adf44e6490da",
-      "args": {
-        "__collapseElse": false
-      }
-    }
-  },
-  "symbol": "actor_1",
-  "script": [],
-  "startScript": [],
-  "updateScript": [],
-  "hit1Script": [],
-  "hit2Script": [],
-  "hit3Script": [],
-  "x": 14,
-  "y": 125,
-  "_index": 2
-}

+ 0 - 27
INDPRO/Game/Silent Specter/SilentSpecter/project/scenes/maps/house/actors/invisiblewall.gbsres

@@ -1,27 +0,0 @@
-{
-  "_resourceType": "actor",
-  "id": "beb74644-7909-4384-bebc-759d9fe111b8",
-  "name": "InvisibleWall",
-  "frame": 0,
-  "animate": false,
-  "spriteSheetId": "581d34d0-9591-4e6e-a609-1d94f203b0cd",
-  "prefabId": "f97b88e4-2b19-4752-ba34-d1b0f742b192",
-  "direction": "down",
-  "moveSpeed": 1,
-  "animSpeed": 15,
-  "paletteId": "",
-  "isPinned": false,
-  "persistent": false,
-  "collisionGroup": "",
-  "prefabScriptOverrides": {},
-  "symbol": "actor_0",
-  "script": [],
-  "startScript": [],
-  "updateScript": [],
-  "hit1Script": [],
-  "hit2Script": [],
-  "hit3Script": [],
-  "x": 49,
-  "y": 119,
-  "_index": 0
-}

+ 4 - 4
INDPRO/Game/Silent Specter/SilentSpecter/project/scenes/maps/house/scene.gbsres

@@ -1,16 +1,16 @@
 {
   "_resourceType": "scene",
   "id": "90c3b550-199c-43eb-b6ea-db3607856f81",
-  "_index": 2,
+  "_index": 0,
   "name": "maps/house",
-  "backgroundId": "79a616fc-f350-4798-aa71-268e704bfdc9",
+  "backgroundId": "e776f158-1a9a-41a5-98c3-489693629b3a",
   "tilesetId": "",
   "width": 125,
-  "height": 128,
+  "height": 58,
   "type": "PLATFORM",
   "paletteIds": [],
   "spritePaletteIds": [],
-  "collisions": "0031bf+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f1a+005+20!0f2b+004+0f13+001b+0f1a+004+20!00!0f2b+004+0f13+0038+20!007+20!003a+0f2+0037+20!007+20!003b+0f2+0036+20!007+20!003c+0f2+0035+20!007+20!003d+0f2+00d+0f70+00d+0f70+00d+",
+  "collisions": "00fa+0f2+00681+0f26+0057+0f26+0055+0f2+0026+0f2+0053+0f2+0026+0f2+0051+0f2+002a+0fa+0047+0f2+002a+0fa+003b+0f2c+0016+0f2+0039+0f2c+0016+0f2+0037+0f2+002a+0f2+0018+0f2+0035+0f2+0044+0f2+0033+0f2+0048+0f8+002b+0f2+0048+0f8+0029+0f2+002d+20!0f2+0022+0f2+0027+0f2+002c+20!0f3+0022+0f2+0025+0f2+012+006+012+002+016+001b+20!0f4+0024+0f2+0023+0f2+002c+20!0f5+0024+0f2+0021+0f2+002d+20!0f6+0026+0f2+001f+0f2+002c+20!0f7+0026+0f2+001d+0f38+0028+0f2+001b+0f38+0028+0f2+001b+0f2+0018+30!0f4+20!0040+0f2+001b+0f2+0019+30!0f2+20!0041+0f2+001b+0f2+001a+0f2+0042+0f2+001b+0f2+001a+0f2+0042+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f36+006+0f26+001b+0f36+006+0f26+001b+0f2+0012+30!0f4+20!0032+30!0f4+20!00e+0f2+001b+0f2+0013+30!0f2+20!0034+30!0f2+20!00f+0f2+001b+0f2+012+0012+0f2+0036+0f2+0010+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f2+005e+0f2+001b+0f1a+005+20!0f1e+004+0f20+001b+0f1a+004+20!0f1f+004+0f20+001b+0f2+001b+20!0fb+0010+30!0f2+20!007+70!0f2+20!0018+0f2+0037+20!0fc+0037+0f2+0036+20!0fd+0037+0f2+0035+20!0fe+0037+0f2+00d+0f70+00d+0f70+00d+",
   "autoFadeSpeed": 1,
   "symbol": "scene_3",
   "x": 456,

+ 0 - 23
INDPRO/Game/Silent Specter/SilentSpecter/project/scenes/maps/test_level/scene.gbsres

@@ -1,23 +0,0 @@
-{
-  "_resourceType": "scene",
-  "id": "fcc23b8d-5294-4789-b643-dae95ca04605",
-  "_index": 1,
-  "name": "maps/test_level",
-  "backgroundId": "d989a134-ff13-40e7-a74f-6250e4db996e",
-  "tilesetId": "",
-  "width": 20,
-  "height": 18,
-  "type": "PLATFORM",
-  "paletteIds": [],
-  "spritePaletteIds": [],
-  "collisions": "0082+0fa+00a+0fa+002e+0fe+006+0fe+002a+0f12+002+0f12+0028+",
-  "autoFadeSpeed": 1,
-  "symbol": "scene_2",
-  "x": 184,
-  "y": 408,
-  "script": [],
-  "playerHit1Script": [],
-  "playerHit2Script": [],
-  "playerHit3Script": [],
-  "playerSpriteSheetId": "6ae2f141-7f1a-4ec8-af30-445db4e3ebac"
-}

+ 0 - 24
INDPRO/Game/Silent Specter/SilentSpecter/project/scenes/ui/title_screen/scene.gbsres

@@ -1,24 +0,0 @@
-{
-  "_resourceType": "scene",
-  "id": "bced98f2-f679-4a78-a824-2853568d8d1f",
-  "_index": 0,
-  "name": "ui/title_screen",
-  "backgroundId": "1e5f9d6a-bdbc-43e6-8c34-22f5bb5dea05",
-  "tilesetId": "",
-  "width": 20,
-  "height": 18,
-  "type": "PLATFORM",
-  "paletteIds": [],
-  "spritePaletteIds": [],
-  "collisions": "00168+",
-  "autoFadeSpeed": 1,
-  "symbol": "scene_1",
-  "x": 184,
-  "y": 152,
-  "script": [],
-  "playerHit1Script": [],
-  "playerHit2Script": [],
-  "playerHit3Script": [],
-  "labelColor": "",
-  "playerSpriteSheetId": "6ae2f141-7f1a-4ec8-af30-445db4e3ebac"
-}

+ 1 - 1
INDPRO/Game/Silent Specter/SilentSpecter/project/settings.gbsres

@@ -2,7 +2,7 @@
   "_resourceType": "settings",
   "startSceneId": "90c3b550-199c-43eb-b6ea-db3607856f81",
   "startX": 4,
-  "startY": 125,
+  "startY": 55,
   "startMoveSpeed": 1,
   "startAnimSpeed": 15,
   "startDirection": "right",

+ 2 - 2
INDPRO/Game/Silent Specter/SilentSpecter/project/variables.gbsres

@@ -18,8 +18,8 @@
     },
     {
       "id": "aa85a6c2-7d1b-4e7c-b0ff-d029b9ec31b7__L1",
-      "name": "_PlayerX",
-      "symbol": "var_playerx"
+      "name": "playerInRange",
+      "symbol": "var_playerinrange"
     },
     {
       "id": "aa85a6c2-7d1b-4e7c-b0ff-d029b9ec31b7__L2",

BIN
INDPRO/Game/Silent Specter/SilentSpecter_PATELLA_Valentin_INPRO2.docx


BIN
INDPRO/Game/Silent Specter/aseprite/House.aseprite