diff --git a/System38.gbsproj b/System38.gbsproj index fdd1fa3..94f0a64 100644 --- a/System38.gbsproj +++ b/System38.gbsproj @@ -57401,9 +57401,9 @@ 15, 15, 15, - 0, - 0, - 0, + 15, + 15, + 15, 15, 15, 15, @@ -57582,7 +57582,7 @@ 0, 0, 15, - 0, + 15, 0, 0, 0, @@ -57630,6 +57630,7 @@ 0, 0, 15, + 15, 0, 0, 0, @@ -57650,7 +57651,6 @@ 0, 0, 0, - 0, 15, 0, 0, @@ -59216,30 +59216,6 @@ "triggers": [ { "name": "", - "trigger": "walk", - "script": [ - { - "id": "482f0a32-f013-4ff4-b800-da0e09c9f6b4", - "command": "EVENT_SWITCH_SCENE", - "args": { - "sceneId": "000c12fc-1c23-4b20-8174-68a98e6cf45a", - "x": 12, - "y": 6, - "direction": "down", - "fadeSpeed": "2" - } - } - ], - "id": "bb3ea017-b18a-4e36-9ec0-e064505a95f1", - "x": 11, - "y": 4, - "width": 2, - "height": 1, - "leaveScript": [], - "symbol": "trigger_66" - }, - { - "name": "", "id": "ace0df35-268f-4d11-a548-e8bdffc48856", "x": 21, "y": 16, @@ -59248,15 +59224,71 @@ "height": 2, "script": [ { + "command": "EVENT_IF_ACTOR_AT_POSITION", + "args": { + "actorId": "21c2f737-e591-439e-91e1-eb269c9188d8", + "x": 12, + "y": 17, + "__collapseElse": true + }, + "children": { + "true": [ + { + "command": "EVENT_SWITCH_SCENE", + "args": { + "sceneId": "51dcab6e-2a91-4346-974f-4f91021b489f", + "x": 62, + "y": 3, + "direction": "left", + "fadeSpeed": "2" + }, + "id": "9ed28cd2-3959-4380-9f4a-b5ad1a1439a8" + } + ], + "false": [] + }, + "id": "4803df14-fb49-4942-b12f-437a3d47cf1e" + } + ], + "leaveScript": [] + }, + { + "name": "", + "id": "1ccb09dc-d8fc-4800-8ef9-fc06f1b4221e", + "x": 12, + "y": 12, + "symbol": "trigger_0", + "width": 3, + "height": 1, + "script": [ + { + "command": "EVENT_ACTOR_EMOTE", + "args": { + "actorId": "$self$", + "emoteId": "49f6ab1b-a353-4f13-81ca-7418b1b1e36f" + }, + "id": "a855372b-72b6-4ca2-af07-04352d0647cb" + }, + { + "command": "EVENT_TEXT", + "args": { + "text": [ + "Hay que traer la\nestructura del\nSystem 38" + ], + "avatarId": "" + }, + "id": "2509d91e-74bb-4dd0-b3dc-a7edf28a811b" + }, + { "command": "EVENT_SWITCH_SCENE", "args": { - "sceneId": "51dcab6e-2a91-4346-974f-4f91021b489f", - "x": 62, - "y": 3, - "direction": "left", + "sceneId": "ef4c2545-04fe-4e70-bd61-4a8f8a21640f", + "x": 41, + "y": 9, + "direction": "down", "fadeSpeed": "2" }, - "id": "9ed28cd2-3959-4380-9f4a-b5ad1a1439a8" + "id": "8775b1c1-8c9a-4ff2-92bf-58b7cd0e6317" } ], "leaveScript": [] @@ -59486,6 +59518,8 @@ 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -59511,6 +59545,8 @@ 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -59531,24 +59567,20 @@ 0, 0, 0, + 15, 0, 0, 0, 0, - 15, 0, 0, 0, - 0, - 0, - 0, + 15, 0, 0, 0, 0, 0, - 15, - 15, 0, 0, 0, @@ -59678,7 +59710,6 @@ 0, 0, 0, - 15, 0, 0, 0, @@ -59689,8 +59720,7 @@ 0, 0, 0, - 0, - 0, + 15, 0, 0, 0, @@ -59700,6 +59730,8 @@ 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -59742,8 +59774,8 @@ 15, 15, 15, - 15, - 15, + 0, + 0, 15, 15, 15, @@ -59801,6 +59833,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -59811,11 +59844,14 @@ 0, 0, 0, + 15, 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -59824,6 +59860,8 @@ 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -59840,13 +59878,8 @@ 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, + 15, 0, 0, 15, @@ -59864,19 +59897,27 @@ 0, 0, 0, + 15, + 15, 0, 0, + 15, 0, 0, 0, 0, 0, 0, + 15, 0, 0, 0, + 15, 0, 0, + 15, + 15, + 15, 0, 0, 0, @@ -59888,16 +59929,8 @@ 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, + 15, 0, 0, 0, @@ -59928,32 +59961,11 @@ 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, + 15, 0, 0, + 15, 0, 0, 0, @@ -59964,8 +59976,10 @@ 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -59978,6 +59992,7 @@ 0, 0, 15, + 15, 0, 0, 0, @@ -59986,13 +60001,16 @@ 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60007,19 +60025,25 @@ 0, 0, 0, + 15, 0, 0, 0, 0, 0, + 15, + 15, 0, 0, 0, 0, + 15, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60047,8 +60071,10 @@ 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60063,6 +60089,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60074,12 +60101,13 @@ 0, 0, 0, - 0, - 0, + 15, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60092,14 +60120,19 @@ 0, 0, 0, + 15, 0, + 15, 0, 0, 0, 0, + 15, 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -60120,8 +60153,10 @@ 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60133,6 +60168,10 @@ 0, 0, 0, + 15, + 15, + 15, + 15, 0, 0, 0, @@ -60145,24 +60184,14 @@ 0, 0, 0, + 15, 0, + 15, 0, 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, 0, 0, 0, @@ -60173,6 +60202,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60187,8 +60217,10 @@ 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60211,8 +60243,8 @@ 0, 0, 0, - 0, - 0, + 15, + 15, 0, 0, 0, @@ -60230,6 +60262,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60248,12 +60281,15 @@ 0, 0, 0, + 15, 0, 0, 0, 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -60261,6 +60297,8 @@ 0, 0, 0, + 15, + 15, 0, 0, 0, @@ -60272,15 +60310,9 @@ 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, + 15, + 15, 0, 0, 0, @@ -60292,6 +60324,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60312,6 +60345,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60326,20 +60360,10 @@ 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, + 15, + 15, + 15, 0, 0, 0, @@ -60352,8 +60376,11 @@ 0, 0, 0, + 15, 0, 0, + 15, + 15, 0, 0, 0, @@ -60367,6 +60394,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60381,6 +60409,7 @@ 0, 0, 0, + 15, 0, 0, 0, @@ -60395,8 +60424,10 @@ 0, 0, 0, + 15, 0, 0, + 15, 0, 0, 0, @@ -60411,11 +60442,11 @@ 0, 0, 0, - 0, - 0, - 0, + 15, + 15, 0, 0, + 15, 0, 0, 0, @@ -60424,6 +60455,8 @@ 0, 0, 0, + 15, + 15, 0, 15, 0, @@ -60440,8 +60473,25 @@ 0, 0, 0, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, + 15, 0, 0, + 15, 0, 0, 0, @@ -60449,14 +60499,7 @@ 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, 15, 0, 0, @@ -60467,29 +60510,20 @@ 0, 0, 0, + 15, 0, 0, 0, 0, + 15, + 15, 0, 0, 0, 0, 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + 15, 0, - 15, 0, 0, 0, @@ -60553,8 +60587,6 @@ 15, 15, 15, - 15, - 0, 0, 0, 0, @@ -61556,7 +61588,7 @@ "playerHit3Script": [], "id": "51dcab6e-2a91-4346-974f-4f91021b489f", "x": 498, - "y": 1912, + "y": 1912.5, "actors": [ { "name": "", @@ -61588,9 +61620,422 @@ "id": "c1200b7d-2065-42ea-8d4f-8e616b84a351", "x": 59, "y": 4 + }, + { + "name": "", + "frame": 0, + "animate": false, + "spriteSheetId": "a1abc40e-c409-4c26-8cc3-9cfb29dfa3e5", + "direction": "down", + "moveSpeed": 1, + "animSpeed": 15, + "paletteId": "", + "isPinned": false, + "persistent": false, + "collisionGroup": "", + "symbol": "actor_67", + "script": [ + { + "command": "EVENT_ACTOR_EMOTE", + "args": { + "actorId": "player", + "emoteId": "d328e688-5350-4c16-a897-d9276d1a08d1" + }, + "id": "8d618366-e804-4fb6-ac85-7b5ff11bf08e" + }, + { + "command": "EVENT_ACTOR_GET_POSITION", + "args": { + "actorId": "player", + "vectorX": "L0", + "vectorY": "L1" + }, + "id": "8b831949-6e18-40eb-b5aa-f60dbafeb9e5" + }, + { + "command": "EVENT_IF_EXPRESSION", + "args": { + "expression": "$L0$ < 48", + "__collapseElse": false + }, + "children": { + "true": [ + { + "command": "EVENT_ACTOR_SET_DIRECTION", + "args": { + "actorId": "$self$", + "direction": { + "type": "direction", + "value": "left" + } + }, + "id": "62611c1d-7b2c-4540-8106-74cfc82dd026" + } + ], + "false": [ + { + "command": "EVENT_ACTOR_SET_DIRECTION", + "args": { + "actorId": "$self$", + "direction": { + "type": "direction", + "value": "right" + } + }, + "id": "06545f81-edf6-4b51-bb34-75a08631c017" + } + ] + }, + "id": "5d18861f-3239-4295-9de6-022b1d142d03" + }, + { + "command": "EVENT_ACTOR_EMOTE", + "args": { + "actorId": "$self$", + "emoteId": "49f6ab1b-a353-4f13-81ca-7418b1b1e36f" + }, + "id": "812634be-3c06-49ec-a253-de32728be5c9" + }, + { + "command": "EVENT_TEXT", + "args": { + "text": [ + "Si, si, me largo" + ], + "avatarId": "" + }, + "id": "9cc31a19-9313-49d2-9b6c-76ef804403ef" + }, + { + "command": "EVENT_ACTOR_MOVE_TO", + "args": { + "actorId": "$self$", + "x": { + "type": "number", + "value": 48 + }, + "y": { + "type": "number", + "value": 14 + }, + "moveType": "horizontal", + "useCollisions": false + }, + "id": "1f84572e-b520-4bfe-9bfc-788470a0ca3c" + }, + { + "command": "EVENT_ACTOR_MOVE_TO", + "args": { + "actorId": "$self$", + "x": { + "type": "number", + "value": 38 + }, + "y": { + "type": "number", + "value": 14 + }, + "moveType": "horizontal", + "useCollisions": false + }, + "id": "122ac07b-d264-42a6-b3a8-a9681e307160" + }, + { + "command": "EVENT_ACTOR_HIDE", + "args": { + "actorId": "$self$" + }, + "id": "10de7a5b-4549-45fa-bb14-a69305c831ae" + }, + { + "command": "EVENT_ACTOR_SET_POSITION", + "args": { + "actorId": "$self$", + "x": { + "type": "number", + "value": 0 + }, + "y": { + "type": "number", + "value": 0 + } + }, + "id": "d34aecd3-74c9-41a2-8869-2283d2935a43" + } + ], + "startScript": [], + "updateScript": [], + "hit1Script": [], + "hit2Script": [], + "hit3Script": [], + "id": "8e7fd7cf-4c8e-4501-9f45-0ad423284157", + "x": 48, + "y": 15 + }, + { + "name": "", + "frame": 0, + "animate": false, + "spriteSheetId": "70792980-1f82-4c36-a689-a8a1d2dee415", + "direction": "down", + "moveSpeed": 1, + "animSpeed": 15, + "paletteId": "", + "isPinned": false, + "persistent": false, + "collisionGroup": "", + "symbol": "actor_69", + "script": [ + { + "command": "EVENT_ACTOR_PUSH", + "args": { + "continue": false + }, + "id": "32a21c1d-e14c-4302-9b9c-4871f7a68564" + } + ], + "startScript": [], + "updateScript": [], + "hit1Script": [], + "hit2Script": [], + "hit3Script": [], + "id": "bf6ef719-d26f-4f30-89ed-44e664fc3c66", + "x": 17, + "y": 16 + }, + { + "name": "", + "frame": 0, + "animate": false, + "spriteSheetId": "70792980-1f82-4c36-a689-a8a1d2dee415", + "direction": "down", + "moveSpeed": 1, + "animSpeed": 15, + "paletteId": "", + "isPinned": false, + "persistent": false, + "collisionGroup": "", + "symbol": "actor_71", + "script": [ + { + "command": "EVENT_ACTOR_PUSH", + "args": { + "continue": false + }, + "id": "2a21704b-45a6-450a-8be6-985a0d3e2a76" + } + ], + "startScript": [], + "updateScript": [], + "hit1Script": [], + "hit2Script": [], + "hit3Script": [], + "id": "af65cbaa-01ff-4a4b-b8e0-c9f7ee07a94d", + "x": 32, + "y": 14 } ], - "triggers": [], + "triggers": [ + { + "name": "", + "id": "6edf4794-7dd0-4efb-9577-cac459b6aa68", + "x": 9, + "y": 4, + "symbol": "trigger_1", + "width": 1, + "height": 1, + "script": [ + { + "command": "EVENT_ACTOR_EMOTE", + "args": { + "actorId": "$self$", + "emoteId": "04ee0dc1-4cba-4617-adae-5579a79179ff" + }, + "id": "aa56130e-523b-4613-893b-c87b36659cc4" + }, + { + "command": "EVENT_TEXT", + "args": { + "text": [ + "Tendría que ir a\npor el armazon" + ], + "avatarId": "" + }, + "id": "cfd6bbc7-523b-4416-956e-89577473337b" + }, + { + "command": "EVENT_ACTOR_MOVE_RELATIVE", + "args": { + "actorId": "$self$", + "x": 5, + "y": 0, + "moveType": "horizontal", + "useCollisions": false + }, + "id": "549d1316-a369-4808-b709-fa219d2eb2d8" + } + ], + "leaveScript": [] + }, + { + "name": "", + "id": "7bc1abec-f36f-474e-92ad-32152d225145", + "x": 13, + "y": 3, + "symbol": "trigger_2", + "width": 1, + "height": 4, + "script": [ + { + "command": "EVENT_IF_ACTOR_AT_POSITION", + "args": { + "actorId": "c1200b7d-2065-42ea-8d4f-8e616b84a351", + "x": 9, + "y": 4, + "__collapseElse": true + }, + "children": { + "true": [ + { + "command": "EVENT_ACTOR_MOVE_TO", + "args": { + "actorId": "$self$", + "x": { + "type": "number", + "value": 11 + }, + "y": { + "type": "number", + "value": 4 + }, + "moveType": "vertical", + "useCollisions": false + }, + "id": "82dd241c-3058-4e0c-9d77-5e53362de9eb" + }, + { + "command": "EVENT_LOOP_FOR", + "args": { + "variable": "L0", + "from": { + "type": "number", + "value": 0 + }, + "comparison": "<=", + "to": { + "type": "number", + "value": 15 + }, + "operation": "+=", + "value": { + "type": "number", + "value": 1 + } + }, + "children": { + "true": [ + { + "command": "EVENT_SOUND_PLAY_EFFECT", + "args": { + "type": "crash", + "priority": "medium", + "pitch": 4, + "frequency": 200, + "duration": 0.5, + "wait": false, + "effect": 0 + }, + "id": "d35be045-d2cf-4c72-8388-a5ec7fcedde0" + }, + { + "command": "EVENT_ACTOR_MOVE_RELATIVE", + "args": { + "actorId": "c1200b7d-2065-42ea-8d4f-8e616b84a351", + "x": -2, + "y": 0, + "moveType": "horizontal", + "useCollisions": false, + "units": "pixels" + }, + "id": "22d057c1-55cc-4373-ae20-18280da9739b" + }, + { + "command": "EVENT_WAIT", + "args": { + "time": 0.5, + "frames": 10, + "units": "frames" + }, + "id": "9f1d9cb5-97e2-42c4-9d41-07a5e79ae666" + }, + { + "command": "EVENT_ACTOR_MOVE_RELATIVE", + "args": { + "actorId": "c1200b7d-2065-42ea-8d4f-8e616b84a351", + "x": 1, + "y": 0, + "moveType": "horizontal", + "useCollisions": false, + "units": "pixels" + }, + "id": "0d2688b7-9b37-4c57-85e4-b952580db9e4" + }, + { + "command": "EVENT_WAIT", + "args": { + "time": 0.5, + "frames": 5, + "units": "frames" + }, + "id": "5d8c21b9-28dc-43e3-a7f2-8634571f5246" + } + ] + }, + "id": "75bfe104-1866-4d51-ac99-4247e98d0bcc" + }, + { + "command": "EVENT_ACTOR_MOVE_TO", + "args": { + "actorId": "c1200b7d-2065-42ea-8d4f-8e616b84a351", + "x": { + "type": "number", + "value": 3 + }, + "y": { + "type": "number", + "value": 4 + }, + "moveType": "horizontal", + "useCollisions": false + }, + "id": "a3a7c7a3-6720-430b-9207-501cbb0dda9c" + }, + { + "command": "EVENT_ACTOR_MOVE_TO", + "args": { + "actorId": "$self$", + "x": { + "type": "number", + "value": 5 + }, + "y": { + "type": "number", + "value": 4 + }, + "moveType": "horizontal", + "useCollisions": false + }, + "id": "f7c59367-bbf7-41ce-9db2-e65bca8cc4b0" + } + ], + "false": [] + }, + "id": "33a41377-94b9-449c-a76d-772f5e065d1b" + } + ], + "leaveScript": [] + } + ], "symbol": "scene_30", "playerSpriteSheetId": "4fd31529-8295-4647-8d19-7419938cc7d4" } @@ -79316,7 +79761,8 @@ "height": 18, "imageWidth": 160, "imageHeight": 144, - "filename": "e04\\03-stage-6.png" + "filename": "e04\\03-stage-6.png", + "tileColors": [] }, { "id": "90ca500c-fd2f-4e63-83ce-669ae2f79fa2", @@ -79326,7 +79772,8 @@ "height": 18, "imageWidth": 160, "imageHeight": 144, - "filename": "e04\\03-stage-7.png" + "filename": "e04\\03-stage-7.png", + "tileColors": [] }, { "id": "df489b3a-8dad-4b6e-8028-37925f4bafe1", @@ -80308,7 +80755,8 @@ "height": 20, "imageWidth": 512, "imageHeight": 160, - "filename": "e05\\e05-02-Pasillo.png" + "filename": "e05\\e05-02-Pasillo.png", + "tileColors": [] }, { "id": "f8b1c7ad-7bb2-44b2-8189-175ae8698f11", @@ -91828,6 +92276,11 @@ "id": "1c9d9b1a-dde3-4a70-86b2-e5f620002195__L0", "name": "Hits", "symbol": "var_hits_44" + }, + { + "id": "8e7fd7cf-4c8e-4501-9f45-0ad423284157__L0", + "name": "Local 0", + "symbol": "var_local_0" } ], "engineFieldValues": [ @@ -91837,15 +92290,15 @@ } ], "settings": { - "startSceneId": "ef4c2545-04fe-4e70-bd61-4a8f8a21640f", - "startX": 41, - "startY": 9, + "startSceneId": "51dcab6e-2a91-4346-974f-4f91021b489f", + "startX": 62, + "startY": 3, "startMoveSpeed": 1, "startAnimSpeed": 15, - "startDirection": "down", + "startDirection": "left", "showCollisions": true, "showConnections": true, - "worldScrollX": 952, + "worldScrollX": 627, "worldScrollY": 3332, "zoom": 200, "customColorsEnabled": true, diff --git a/assets/backgrounds/e05/e05-02-Pasillo.png b/assets/backgrounds/e05/e05-02-Pasillo.png index 832085d..2322b47 100644 --- a/assets/backgrounds/e05/e05-02-Pasillo.png +++ b/assets/backgrounds/e05/e05-02-Pasillo.png Binary files differ