From 8ca5af86c40c738b6541d84a070ef6330d152662 Mon Sep 17 00:00:00 2001 From: rgrzanic <52929309+rgrzanic@users.noreply.github.com> Date: Wed, 24 Jul 2019 11:15:56 -0600 Subject: [PATCH] store changes, toy fixes, other improvements --- Bloble.yyp | 120 ++++++++++++++++++ objects/obj_Store_Coins/Draw_64.gml | 3 + objects/obj_Store_Coins/obj_Store_Coins.yy | 38 ++++++ .../obj_Store_Food_Button.yy | 29 +++++ objects/obj_Store_Pay_Button/Gesture_0.gml | 2 + .../obj_Store_Pay_Button.yy | 38 ++++++ objects/obj_Store_Toy_Ball/Create_0.gml | 2 + objects/obj_Store_Toy_Ball/Draw_64.gml | 3 + objects/obj_Store_Toy_Ball/Gesture_0.gml | 10 ++ .../obj_Store_Toy_Ball/obj_Store_Toy_Ball.yy | 58 +++++++++ .../obj_Store_Toy_Button.yy | 29 +++++ objects/obj_Store_Toy_Pinwheel/Create_0.gml | 1 + objects/obj_Store_Toy_Pinwheel/Draw_64.gml | 2 + .../obj_Store_Toy_Pinwheel.yy | 48 +++++++ objects/obj_Toy_Ball/obj_Toy_Ball.yy | 2 +- objects/obj_bloblehop_generator/Step_0.gml | 12 +- objects/obj_bloblehop_platform/Create_0.gml | 3 +- .../obj_bloblehop_platformboost/Create_0.gml | 4 + .../obj_bloblehop_platformboost.yy | 38 ++++++ objects/obj_bloblehop_player/Create_0.gml | 1 + objects/obj_bloblehop_player/Step_0.gml | 12 +- objects/obj_difficulty_easy/Gesture_0.gml | 9 ++ objects/obj_difficulty_expert/Gesture_0.gml | 8 ++ objects/obj_store_roomback/Gesture_0.gml | 2 + .../obj_store_roomback/obj_store_roomback.yy | 38 ++++++ rooms/rm_Store/rm_Store.yy | 6 +- rooms/rm_StoreFood/rm_StoreFood.yy | 117 +++++++++++++++++ rooms/rm_StorePay/rm_StorePay.yy | 117 +++++++++++++++++ rooms/rm_StoreToys/rm_StoreToys.yy | 117 +++++++++++++++++ .../49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86.png | Bin 0 -> 203 bytes .../5b165aec-f4cc-47da-a9f0-d8b3d568a980.png | Bin 0 -> 203 bytes .../spr_Store_Food_Button.yy | 70 ++++++++++ .../5c202e80-72cf-4493-96a5-12164490938e.png | Bin 0 -> 258 bytes .../27fde5e8-71c4-4405-8ecb-5acf841e08c3.png | Bin 0 -> 258 bytes .../spr_Store_Pay_Button.yy | 70 ++++++++++ .../f4e25dd8-b44c-4036-8ca3-047bbf2e0ada.png | Bin 0 -> 122 bytes .../2e985516-16da-48bd-8c42-7394000ab3ce.png | Bin 0 -> 129 bytes .../spr_Store_Toy_Ball/spr_Store_Toy_Ball.yy | 70 ++++++++++ .../0c5cd6a5-5108-429a-a431-5971038f6506.png | Bin 0 -> 203 bytes .../8bde6b74-452b-450f-b9ba-f2e2b4c73d70.png | Bin 0 -> 203 bytes .../spr_Store_Toy_Button.yy | 70 ++++++++++ views/75ae81e4-73cd-4939-908a-676d351c8602.yy | 1 + views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy | 6 +- views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy | 9 +- views/e397fd61-3040-4d63-a320-7d2e697fa442.yy | 5 +- 45 files changed, 1159 insertions(+), 11 deletions(-) create mode 100644 objects/obj_Store_Coins/Draw_64.gml create mode 100644 objects/obj_Store_Coins/obj_Store_Coins.yy create mode 100644 objects/obj_Store_Food_Button/obj_Store_Food_Button.yy create mode 100644 objects/obj_Store_Pay_Button/Gesture_0.gml create mode 100644 objects/obj_Store_Pay_Button/obj_Store_Pay_Button.yy create mode 100644 objects/obj_Store_Toy_Ball/Create_0.gml create mode 100644 objects/obj_Store_Toy_Ball/Draw_64.gml create mode 100644 objects/obj_Store_Toy_Ball/Gesture_0.gml create mode 100644 objects/obj_Store_Toy_Ball/obj_Store_Toy_Ball.yy create mode 100644 objects/obj_Store_Toy_Button/obj_Store_Toy_Button.yy create mode 100644 objects/obj_Store_Toy_Pinwheel/Create_0.gml create mode 100644 objects/obj_Store_Toy_Pinwheel/Draw_64.gml create mode 100644 objects/obj_Store_Toy_Pinwheel/obj_Store_Toy_Pinwheel.yy create mode 100644 objects/obj_bloblehop_platformboost/Create_0.gml create mode 100644 objects/obj_bloblehop_platformboost/obj_bloblehop_platformboost.yy create mode 100644 objects/obj_store_roomback/Gesture_0.gml create mode 100644 objects/obj_store_roomback/obj_store_roomback.yy create mode 100644 rooms/rm_StoreFood/rm_StoreFood.yy create mode 100644 rooms/rm_StorePay/rm_StorePay.yy create mode 100644 rooms/rm_StoreToys/rm_StoreToys.yy create mode 100644 sprites/spr_Store_Food_Button/49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86.png create mode 100644 sprites/spr_Store_Food_Button/layers/49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86/5b165aec-f4cc-47da-a9f0-d8b3d568a980.png create mode 100644 sprites/spr_Store_Food_Button/spr_Store_Food_Button.yy create mode 100644 sprites/spr_Store_Pay_Button/5c202e80-72cf-4493-96a5-12164490938e.png create mode 100644 sprites/spr_Store_Pay_Button/layers/5c202e80-72cf-4493-96a5-12164490938e/27fde5e8-71c4-4405-8ecb-5acf841e08c3.png create mode 100644 sprites/spr_Store_Pay_Button/spr_Store_Pay_Button.yy create mode 100644 sprites/spr_Store_Toy_Ball/f4e25dd8-b44c-4036-8ca3-047bbf2e0ada.png create mode 100644 sprites/spr_Store_Toy_Ball/layers/f4e25dd8-b44c-4036-8ca3-047bbf2e0ada/2e985516-16da-48bd-8c42-7394000ab3ce.png create mode 100644 sprites/spr_Store_Toy_Ball/spr_Store_Toy_Ball.yy create mode 100644 sprites/spr_Store_Toy_Button/0c5cd6a5-5108-429a-a431-5971038f6506.png create mode 100644 sprites/spr_Store_Toy_Button/layers/0c5cd6a5-5108-429a-a431-5971038f6506/8bde6b74-452b-450f-b9ba-f2e2b4c73d70.png create mode 100644 sprites/spr_Store_Toy_Button/spr_Store_Toy_Button.yy diff --git a/Bloble.yyp b/Bloble.yyp index ed6ae4f..ec9d213 100644 --- a/Bloble.yyp +++ b/Bloble.yyp @@ -30,6 +30,14 @@ "projectPath": "${base_project}" }, "resources": [ + { + "Key": "00ff2b8a-65e1-412b-b046-f6aff462dd90", + "Value": { + "id": "d76fd0cf-fdc2-4d5c-96cc-2a566f265748", + "resourcePath": "rooms\\rm_StoreToys\\rm_StoreToys.yy", + "resourceType": "GMRoom" + } + }, { "Key": "03c2eb82-6b1e-4f45-9122-756c03b63468", "Value": { @@ -126,6 +134,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "15707364-5db0-4198-b5b0-36bcfb244932", + "Value": { + "id": "4f776c9b-0b9a-4bd9-8261-e8386a47d592", + "resourcePath": "objects\\obj_Store_Toy_Ball\\obj_Store_Toy_Ball.yy", + "resourceType": "GMObject" + } + }, { "Key": "158c5696-455f-4087-8e55-a3002c52d760", "Value": { @@ -310,6 +326,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "32a0ec0b-3c25-4440-8bf5-a944232ac352", + "Value": { + "id": "d9688e48-4114-4026-a379-5b342d7937a7", + "resourcePath": "sprites\\spr_Store_Toy_Button\\spr_Store_Toy_Button.yy", + "resourceType": "GMSprite" + } + }, { "Key": "334d75d0-c561-4e8d-8827-9ef8bae4ea2e", "Value": { @@ -366,6 +390,14 @@ "resourceType": "GMObject" } }, + { + "Key": "3eb2283a-f44f-4b7c-83a5-0b9358d7508d", + "Value": { + "id": "f74f7c34-0158-4ad3-b57c-8596fb640fce", + "resourcePath": "objects\\obj_Store_Toy_Pinwheel\\obj_Store_Toy_Pinwheel.yy", + "resourceType": "GMObject" + } + }, { "Key": "454b66d4-7202-4d15-ae18-888e04f5c863", "Value": { @@ -382,6 +414,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "49627d82-e041-440f-8c0e-a43d5c2da2c9", + "Value": { + "id": "d0d474ae-7b5a-4f53-a142-f1a7219d7f1b", + "resourcePath": "sprites\\spr_Store_Pay_Button\\spr_Store_Pay_Button.yy", + "resourceType": "GMSprite" + } + }, { "Key": "4b6675f5-9579-4c39-aefe-ec91d8c1e0b6", "Value": { @@ -406,6 +446,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "5023793c-1056-45bf-ac29-911440787d46", + "Value": { + "id": "2cfba303-527a-4504-b488-20e010ea7235", + "resourcePath": "objects\\obj_store_roomback\\obj_store_roomback.yy", + "resourceType": "GMObject" + } + }, { "Key": "5275a5d8-3cbc-4243-b700-d7d84a5810cf", "Value": { @@ -446,6 +494,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "5ba4a0e1-0adc-45d6-b83f-077c19b7bf80", + "Value": { + "id": "b83ef030-ec63-4eec-93ea-eb06688dff3a", + "resourcePath": "sprites\\spr_Store_Toy_Ball\\spr_Store_Toy_Ball.yy", + "resourceType": "GMSprite" + } + }, { "Key": "6128d1c6-23f5-4c81-9ea4-fff204f56717", "Value": { @@ -454,6 +510,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "63e45c47-2871-43a6-96da-06a9d230718b", + "Value": { + "id": "b2b90ecd-b5a0-40e8-bd18-52e1d99a5a19", + "resourcePath": "sprites\\spr_Store_Food_Button\\spr_Store_Food_Button.yy", + "resourceType": "GMSprite" + } + }, { "Key": "64786372-1543-43eb-956b-f5d3a8a94cdf", "Value": { @@ -462,6 +526,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "6527a792-3a28-4534-9405-0220578fff5a", + "Value": { + "id": "4078c769-26f4-416f-bcae-308cb74b34ef", + "resourcePath": "objects\\obj_Store_Food_Button\\obj_Store_Food_Button.yy", + "resourceType": "GMObject" + } + }, { "Key": "6756de28-a22d-4fa5-af4f-0ee649cb0d7f", "Value": { @@ -574,6 +646,14 @@ "resourceType": "GMSprite" } }, + { + "Key": "8e27ec92-4c63-4a81-86d5-b9a47a31c504", + "Value": { + "id": "dfdc1108-1a6f-4e58-a511-f0f26a894537", + "resourcePath": "objects\\obj_Store_Toy_Button\\obj_Store_Toy_Button.yy", + "resourceType": "GMObject" + } + }, { "Key": "92c6cdd6-240a-4e23-8ca2-d0820f1a6cc9", "Value": { @@ -830,6 +910,14 @@ "resourceType": "GMFolder" } }, + { + "Key": "c4852add-a528-4793-9bca-300074b0a814", + "Value": { + "id": "99d160df-a156-4b30-9dde-ad9e73906940", + "resourcePath": "objects\\obj_Store_Coins\\obj_Store_Coins.yy", + "resourceType": "GMObject" + } + }, { "Key": "c72d5424-94e0-4e12-a322-4b08adba663d", "Value": { @@ -854,6 +942,14 @@ "resourceType": "GMIncludedFile" } }, + { + "Key": "c7865271-2823-4ff2-8aab-5303a189c38f", + "Value": { + "id": "f23a147b-000c-4fe0-9954-e87ba1a3bd57", + "resourcePath": "rooms\\rm_StoreFood\\rm_StoreFood.yy", + "resourceType": "GMRoom" + } + }, { "Key": "c8cf60c0-7980-4732-b018-abb76e7117ac", "Value": { @@ -894,6 +990,22 @@ "resourceType": "GMWindowsOptions" } }, + { + "Key": "d715bace-a603-48a9-8d69-b9b3f6ee3029", + "Value": { + "id": "6065824c-75c6-4258-ba3f-bc5044075c80", + "resourcePath": "objects\\obj_bloblehop_platformboost\\obj_bloblehop_platformboost.yy", + "resourceType": "GMObject" + } + }, + { + "Key": "d81ba1dc-478e-4772-9503-ee6dcfde9825", + "Value": { + "id": "10e44611-4868-4de5-9e16-a60e600d306d", + "resourcePath": "rooms\\rm_StorePay\\rm_StorePay.yy", + "resourceType": "GMRoom" + } + }, { "Key": "dd2fc978-0a6f-4331-91a6-12060298c4e0", "Value": { @@ -1078,6 +1190,14 @@ "resourceType": "GMObject" } }, + { + "Key": "fc383e14-438a-4cd2-b957-f1be645cebe3", + "Value": { + "id": "13ce81d9-099e-44a9-993a-252d85e102a1", + "resourcePath": "objects\\obj_Store_Pay_Button\\obj_Store_Pay_Button.yy", + "resourceType": "GMObject" + } + }, { "Key": "fd613f09-8df2-4dd4-84ff-22313f8fc3b2", "Value": { diff --git a/objects/obj_Store_Coins/Draw_64.gml b/objects/obj_Store_Coins/Draw_64.gml new file mode 100644 index 0000000..5477478 --- /dev/null +++ b/objects/obj_Store_Coins/Draw_64.gml @@ -0,0 +1,3 @@ +draw_set_font(fnt_Title) +draw_set_halign(fa_left) +draw_text(200,300,"Coins " + string(global.coin)) \ No newline at end of file diff --git a/objects/obj_Store_Coins/obj_Store_Coins.yy b/objects/obj_Store_Coins/obj_Store_Coins.yy new file mode 100644 index 0000000..b813492 --- /dev/null +++ b/objects/obj_Store_Coins/obj_Store_Coins.yy @@ -0,0 +1,38 @@ +{ + "id": "c4852add-a528-4793-9bca-300074b0a814", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Store_Coins", + "eventList": [ + { + "id": "55defd05-719c-4960-84b5-7afd5be81098", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 64, + "eventtype": 8, + "m_owner": "c4852add-a528-4793-9bca-300074b0a814" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "7fa21620-f301-4982-872a-9502c271bebf", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_Store_Food_Button/obj_Store_Food_Button.yy b/objects/obj_Store_Food_Button/obj_Store_Food_Button.yy new file mode 100644 index 0000000..2b75250 --- /dev/null +++ b/objects/obj_Store_Food_Button/obj_Store_Food_Button.yy @@ -0,0 +1,29 @@ +{ + "id": "6527a792-3a28-4534-9405-0220578fff5a", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Store_Food_Button", + "eventList": [ + + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "63e45c47-2871-43a6-96da-06a9d230718b", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_Store_Pay_Button/Gesture_0.gml b/objects/obj_Store_Pay_Button/Gesture_0.gml new file mode 100644 index 0000000..d0815d3 --- /dev/null +++ b/objects/obj_Store_Pay_Button/Gesture_0.gml @@ -0,0 +1,2 @@ +global.roomset = rm_StorePay; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_Store_Pay_Button/obj_Store_Pay_Button.yy b/objects/obj_Store_Pay_Button/obj_Store_Pay_Button.yy new file mode 100644 index 0000000..ebe9ce5 --- /dev/null +++ b/objects/obj_Store_Pay_Button/obj_Store_Pay_Button.yy @@ -0,0 +1,38 @@ +{ + "id": "fc383e14-438a-4cd2-b957-f1be645cebe3", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Store_Pay_Button", + "eventList": [ + { + "id": "46e9a925-76a5-4410-b7d2-64ff0e86bc44", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "fc383e14-438a-4cd2-b957-f1be645cebe3" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "49627d82-e041-440f-8c0e-a43d5c2da2c9", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_Store_Toy_Ball/Create_0.gml b/objects/obj_Store_Toy_Ball/Create_0.gml new file mode 100644 index 0000000..cfe4da4 --- /dev/null +++ b/objects/obj_Store_Toy_Ball/Create_0.gml @@ -0,0 +1,2 @@ +image_speed = 0; + \ No newline at end of file diff --git a/objects/obj_Store_Toy_Ball/Draw_64.gml b/objects/obj_Store_Toy_Ball/Draw_64.gml new file mode 100644 index 0000000..0d6a93c --- /dev/null +++ b/objects/obj_Store_Toy_Ball/Draw_64.gml @@ -0,0 +1,3 @@ +draw_set_font(fnt_sizesmall) +draw_set_halign(fa_left) +draw_text(100,100,"Price" + string(global.toyballprice)) \ No newline at end of file diff --git a/objects/obj_Store_Toy_Ball/Gesture_0.gml b/objects/obj_Store_Toy_Ball/Gesture_0.gml new file mode 100644 index 0000000..baa8b90 --- /dev/null +++ b/objects/obj_Store_Toy_Ball/Gesture_0.gml @@ -0,0 +1,10 @@ +if (global.coin >= global.toyballprice) +{ + if global.toyball = 0 + + { + global.coin -= global.toyballprice + global.toyball = 1 + object_set_sprite(obj_Toy_Ball, spr_Toy_Ball) + } +} \ No newline at end of file diff --git a/objects/obj_Store_Toy_Ball/obj_Store_Toy_Ball.yy b/objects/obj_Store_Toy_Ball/obj_Store_Toy_Ball.yy new file mode 100644 index 0000000..1a3fa23 --- /dev/null +++ b/objects/obj_Store_Toy_Ball/obj_Store_Toy_Ball.yy @@ -0,0 +1,58 @@ +{ + "id": "15707364-5db0-4198-b5b0-36bcfb244932", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Store_Toy_Ball", + "eventList": [ + { + "id": "4d9077ae-8ac8-416a-a278-94441508595d", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "15707364-5db0-4198-b5b0-36bcfb244932" + }, + { + "id": "2e5459fe-469f-466d-b927-9f025ad47191", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 64, + "eventtype": 8, + "m_owner": "15707364-5db0-4198-b5b0-36bcfb244932" + }, + { + "id": "5bc4931a-9e36-400d-90ba-81795ce41ce7", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "15707364-5db0-4198-b5b0-36bcfb244932" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "5ba4a0e1-0adc-45d6-b83f-077c19b7bf80", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_Store_Toy_Button/obj_Store_Toy_Button.yy b/objects/obj_Store_Toy_Button/obj_Store_Toy_Button.yy new file mode 100644 index 0000000..ba58396 --- /dev/null +++ b/objects/obj_Store_Toy_Button/obj_Store_Toy_Button.yy @@ -0,0 +1,29 @@ +{ + "id": "8e27ec92-4c63-4a81-86d5-b9a47a31c504", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Store_Toy_Button", + "eventList": [ + + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "32a0ec0b-3c25-4440-8bf5-a944232ac352", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_Store_Toy_Pinwheel/Create_0.gml b/objects/obj_Store_Toy_Pinwheel/Create_0.gml new file mode 100644 index 0000000..69a09ba --- /dev/null +++ b/objects/obj_Store_Toy_Pinwheel/Create_0.gml @@ -0,0 +1 @@ +image_speed = 0; \ No newline at end of file diff --git a/objects/obj_Store_Toy_Pinwheel/Draw_64.gml b/objects/obj_Store_Toy_Pinwheel/Draw_64.gml new file mode 100644 index 0000000..2d48041 --- /dev/null +++ b/objects/obj_Store_Toy_Pinwheel/Draw_64.gml @@ -0,0 +1,2 @@ +/// @description Insert description here +// You can write your code in this editor diff --git a/objects/obj_Store_Toy_Pinwheel/obj_Store_Toy_Pinwheel.yy b/objects/obj_Store_Toy_Pinwheel/obj_Store_Toy_Pinwheel.yy new file mode 100644 index 0000000..bfb6305 --- /dev/null +++ b/objects/obj_Store_Toy_Pinwheel/obj_Store_Toy_Pinwheel.yy @@ -0,0 +1,48 @@ +{ + "id": "3eb2283a-f44f-4b7c-83a5-0b9358d7508d", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_Store_Toy_Pinwheel", + "eventList": [ + { + "id": "6c3dcb57-580c-41bb-bb5b-bd9eba9c1796", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "3eb2283a-f44f-4b7c-83a5-0b9358d7508d" + }, + { + "id": "d6b0396a-1e4f-44c0-bdc8-3609acf3ab08", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 64, + "eventtype": 8, + "m_owner": "3eb2283a-f44f-4b7c-83a5-0b9358d7508d" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "2b967772-2c92-4be0-8848-11bb921d9c8f", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_Toy_Ball/obj_Toy_Ball.yy b/objects/obj_Toy_Ball/obj_Toy_Ball.yy index 7004637..129a4eb 100644 --- a/objects/obj_Toy_Ball/obj_Toy_Ball.yy +++ b/objects/obj_Toy_Ball/obj_Toy_Ball.yy @@ -24,6 +24,6 @@ "physicsStartAwake": true, "properties": null, "solid": false, - "spriteId": "df3c9ca1-c1bf-4ed3-b988-febedd0e8fec", + "spriteId": "15dff546-9cad-4db7-b401-16a142ebc9ee", "visible": true } \ No newline at end of file diff --git a/objects/obj_bloblehop_generator/Step_0.gml b/objects/obj_bloblehop_generator/Step_0.gml index eff67e9..9eed42d 100644 --- a/objects/obj_bloblehop_generator/Step_0.gml +++ b/objects/obj_bloblehop_generator/Step_0.gml @@ -22,6 +22,16 @@ if ygen >= ylim { image_xscale=xscale image_yscale=yscale + if irandom_range(1,30) = 4 + { + inst = instance_create_depth(x,y,-2,obj_bloblehop_platformboost) + with inst + { + image_xscale=xscale + image_yscale=yscale + } + instance_destroy() + } } ygen -= global.ystep } @@ -38,4 +48,4 @@ else instance_destroy() } -global.ystep += 3 \ No newline at end of file +global.ystep += 1 \ No newline at end of file diff --git a/objects/obj_bloblehop_platform/Create_0.gml b/objects/obj_bloblehop_platform/Create_0.gml index 90a7fa0..b7f2f00 100644 --- a/objects/obj_bloblehop_platform/Create_0.gml +++ b/objects/obj_bloblehop_platform/Create_0.gml @@ -1,3 +1,4 @@ -image_speed = 0 +image_speed = 0; +image_index = 0; xscale=5 yscale=5 \ No newline at end of file diff --git a/objects/obj_bloblehop_platformboost/Create_0.gml b/objects/obj_bloblehop_platformboost/Create_0.gml new file mode 100644 index 0000000..d0e9eba --- /dev/null +++ b/objects/obj_bloblehop_platformboost/Create_0.gml @@ -0,0 +1,4 @@ +image_speed = 0; +image_index = 1; +xscale=5 +yscale=5 \ No newline at end of file diff --git a/objects/obj_bloblehop_platformboost/obj_bloblehop_platformboost.yy b/objects/obj_bloblehop_platformboost/obj_bloblehop_platformboost.yy new file mode 100644 index 0000000..e59116e --- /dev/null +++ b/objects/obj_bloblehop_platformboost/obj_bloblehop_platformboost.yy @@ -0,0 +1,38 @@ +{ + "id": "d715bace-a603-48a9-8d69-b9b3f6ee3029", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_bloblehop_platformboost", + "eventList": [ + { + "id": "c036a9d0-c8f6-4782-9b64-c72b05004082", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 0, + "m_owner": "d715bace-a603-48a9-8d69-b9b3f6ee3029" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "1c0db5c3-eeb2-47b5-accd-224c7a593234", + "visible": true +} \ No newline at end of file diff --git a/objects/obj_bloblehop_player/Create_0.gml b/objects/obj_bloblehop_player/Create_0.gml index ab0709a..d98f59e 100644 --- a/objects/obj_bloblehop_player/Create_0.gml +++ b/objects/obj_bloblehop_player/Create_0.gml @@ -4,5 +4,6 @@ movespeed = .8 maxvsp = 40 maxhsp = 20 jumpspeed = 40 +boostjumpspeed = 50 vsp = 0 hsp = 0 \ No newline at end of file diff --git a/objects/obj_bloblehop_player/Step_0.gml b/objects/obj_bloblehop_player/Step_0.gml index d709055..0ab3781 100644 --- a/objects/obj_bloblehop_player/Step_0.gml +++ b/objects/obj_bloblehop_player/Step_0.gml @@ -14,7 +14,7 @@ if hsp > maxhsp or hsp < -maxhsp x += hsp -inst = instance_nearest(x, y, obj_bloblehop_platform) + if vsp >0 @@ -23,6 +23,13 @@ inst = instance_nearest(x, y, obj_bloblehop_platform) } + if vsp >0 + { + if (place_meeting(x,y+1,obj_bloblehop_platformboost)) || (place_meeting(x,y-1,obj_bloblehop_platformboost)){ vsp = -boostjumpspeed} + + } + + y += vsp if y > (camera_get_view_y(view_camera[0]) + 1800) @@ -30,6 +37,5 @@ if y > (camera_get_view_y(view_camera[0]) + 1800) //global.stathappiness += global.minigamehappiness //global.statenergy -= global.minigameenergy - global.roomset = rm_Gameover; - instance_create_depth(1,1,-1, obj_fade) + room_goto(rm_Gameover) } \ No newline at end of file diff --git a/objects/obj_difficulty_easy/Gesture_0.gml b/objects/obj_difficulty_easy/Gesture_0.gml index e0d611f..6cfe566 100644 --- a/objects/obj_difficulty_easy/Gesture_0.gml +++ b/objects/obj_difficulty_easy/Gesture_0.gml @@ -7,5 +7,14 @@ global.stathealth = 10 global.coin = 10; +global.toyball = 0; +global.toypinwheel = 0; + +global.toyballprice = 10 +global.toypinwheelprice = 10 + + + + global.roomset = rm_Start; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_difficulty_expert/Gesture_0.gml b/objects/obj_difficulty_expert/Gesture_0.gml index a1b74b4..930caa1 100644 --- a/objects/obj_difficulty_expert/Gesture_0.gml +++ b/objects/obj_difficulty_expert/Gesture_0.gml @@ -6,5 +6,13 @@ global.stathappiness = 7 global.stathealth = 7 global.coin = 0 + +global.toyball = 0; +global.toypinwheel = 0; + +global.toyballprice = 10 +global.toypinwheelprice = 10 + + global.roomset = rm_Start; instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_store_roomback/Gesture_0.gml b/objects/obj_store_roomback/Gesture_0.gml new file mode 100644 index 0000000..9bd7283 --- /dev/null +++ b/objects/obj_store_roomback/Gesture_0.gml @@ -0,0 +1,2 @@ +global.roomset = rm_Store; +instance_create_depth(1,1,-1, obj_fade) \ No newline at end of file diff --git a/objects/obj_store_roomback/obj_store_roomback.yy b/objects/obj_store_roomback/obj_store_roomback.yy new file mode 100644 index 0000000..64be23f --- /dev/null +++ b/objects/obj_store_roomback/obj_store_roomback.yy @@ -0,0 +1,38 @@ +{ + "id": "5023793c-1056-45bf-ac29-911440787d46", + "modelName": "GMObject", + "mvc": "1.0", + "name": "obj_store_roomback", + "eventList": [ + { + "id": "171f719d-3688-448b-93b8-9264e6001786", + "modelName": "GMEvent", + "mvc": "1.0", + "IsDnD": false, + "collisionObjectId": "00000000-0000-0000-0000-000000000000", + "enumb": 0, + "eventtype": 13, + "m_owner": "5023793c-1056-45bf-ac29-911440787d46" + } + ], + "maskSpriteId": "00000000-0000-0000-0000-000000000000", + "overriddenProperties": null, + "parentObjectId": "00000000-0000-0000-0000-000000000000", + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 0, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": null, + "physicsStartAwake": true, + "properties": null, + "solid": false, + "spriteId": "31e69599-86a9-4641-8f9a-e984d4c8f29b", + "visible": true +} \ No newline at end of file diff --git a/rooms/rm_Store/rm_Store.yy b/rooms/rm_Store/rm_Store.yy index 7fd6e75..281b533 100644 --- a/rooms/rm_Store/rm_Store.yy +++ b/rooms/rm_Store/rm_Store.yy @@ -7,7 +7,8 @@ "inheritCreationOrder": false, "inheritLayers": false, "instanceCreationOrderIDs": [ - "bc519444-89e7-41f5-a36a-d60953323720" + "bc519444-89e7-41f5-a36a-d60953323720", + "aad4042c-64c9-4e22-9570-220d94ac0e0b" ], "IsDnD": false, "layers": [ @@ -25,7 +26,8 @@ "inheritSubLayers": false, "inheritVisibility": false, "instances": [ -{"name": "inst_328C984B","id": "bc519444-89e7-41f5-a36a-d60953323720","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_328C984B","objId": "a0c9838a-d9ba-47ab-9302-83b718a6afb3","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 32,"y": 1792} +{"name": "inst_328C984B","id": "bc519444-89e7-41f5-a36a-d60953323720","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_328C984B","objId": "a0c9838a-d9ba-47ab-9302-83b718a6afb3","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 32,"y": 1792}, +{"name": "inst_73D56D09","id": "aad4042c-64c9-4e22-9570-220d94ac0e0b","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_73D56D09","objId": "fc383e14-438a-4cd2-b957-f1be645cebe3","properties": null,"rotation": 0,"scaleX": 10,"scaleY": 10,"mvc": "1.1","x": 832,"y": 32} ], "layers": [ diff --git a/rooms/rm_StoreFood/rm_StoreFood.yy b/rooms/rm_StoreFood/rm_StoreFood.yy new file mode 100644 index 0000000..0e57d98 --- /dev/null +++ b/rooms/rm_StoreFood/rm_StoreFood.yy @@ -0,0 +1,117 @@ + +{ + "name": "rm_StoreFood", + "id": "c7865271-2823-4ff2-8aab-5303a189c38f", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrderIDs": [ + "f569b947-9911-43ea-92af-b6b49d36125a" + ], + "IsDnD": false, + "layers": [ + { + "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", + "name": "Instances", + "id": "1188e6f7-b92d-4bab-bd7b-d98c7cad28c2", + "depth": 0, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "instances": [ +{"name": "inst_63152330","id": "f569b947-9911-43ea-92af-b6b49d36125a","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_63152330","objId": "5023793c-1056-45bf-ac29-911440787d46","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 32,"y": 1792} + ], + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRInstanceLayer", + "mvc": "1.0", + "userdefined_depth": false, + "visible": true + }, + { + "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", + "name": "Background", + "id": "fc81b424-47b4-4cfc-9a09-19589de7ee02", + "animationFPS": 15, + "animationSpeedType": "0", + "colour": { "Value": 4294967295 }, + "depth": 100, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "hspeed": 0, + "htiled": false, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRBackgroundLayer", + "mvc": "1.0", + "spriteId": "00000000-0000-0000-0000-000000000000", + "stretch": false, + "userdefined_animFPS": false, + "userdefined_depth": false, + "visible": true, + "vspeed": 0, + "vtiled": false, + "x": 0, + "y": 0 + } + ], + "modelName": "GMRoom", + "parentId": "00000000-0000-0000-0000-000000000000", + "physicsSettings": { + "id": "b8713f93-866c-4c71-b743-bbbdadcd7055", + "inheritPhysicsSettings": false, + "modelName": "GMRoomPhysicsSettings", + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0, + "PhysicsWorldGravityY": 10, + "PhysicsWorldPixToMeters": 0.1, + "mvc": "1.0" + }, + "roomSettings": { + "id": "b65e47cb-b958-4cd4-b23d-704d8e6c3374", + "Height": 1920, + "inheritRoomSettings": false, + "modelName": "GMRoomSettings", + "persistent": false, + "mvc": "1.0", + "Width": 1080 + }, + "mvc": "1.0", + "views": [ +{"id": "37e29ca8-2f19-4cdb-ab9d-f3a18161e21e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "7ea6fe76-5b35-4ac5-b0f9-7b4e40f8bf02","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "49797317-3279-43c5-9c56-31ab864d2c8f","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "d071c71a-6bd0-4762-8c9e-be21c2ca7e6f","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "93406149-3413-43c2-bd6c-ad8ef1e8b264","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "98db17af-3b67-492c-9199-eb9f2f9481c1","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "4df5c352-4608-4f56-b725-d31d5dec88b3","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "438ff534-c16b-40b3-9ae3-78a28f1e2aa0","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} + ], + "viewSettings": { + "id": "e9b0df6c-074c-42ed-ab74-e7d8b5cf5ebe", + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + "modelName": "GMRoomViewSettings", + "mvc": "1.0" + } +} \ No newline at end of file diff --git a/rooms/rm_StorePay/rm_StorePay.yy b/rooms/rm_StorePay/rm_StorePay.yy new file mode 100644 index 0000000..7a23107 --- /dev/null +++ b/rooms/rm_StorePay/rm_StorePay.yy @@ -0,0 +1,117 @@ + +{ + "name": "rm_StorePay", + "id": "d81ba1dc-478e-4772-9503-ee6dcfde9825", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrderIDs": [ + "51508ab4-8c7d-4603-8df7-94e2bb9d3b52" + ], + "IsDnD": false, + "layers": [ + { + "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", + "name": "Instances", + "id": "83d3a2fa-8cdb-41a3-bd37-75111de4639d", + "depth": 0, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "instances": [ +{"name": "inst_4C7BC52C","id": "51508ab4-8c7d-4603-8df7-94e2bb9d3b52","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_4C7BC52C","objId": "5023793c-1056-45bf-ac29-911440787d46","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 32,"y": 1792} + ], + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRInstanceLayer", + "mvc": "1.0", + "userdefined_depth": false, + "visible": true + }, + { + "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", + "name": "Background", + "id": "8543e6f3-0a7a-49a9-984d-cbaf7b9c5d14", + "animationFPS": 15, + "animationSpeedType": "0", + "colour": { "Value": 4294967295 }, + "depth": 100, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "hspeed": 0, + "htiled": false, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRBackgroundLayer", + "mvc": "1.0", + "spriteId": "00000000-0000-0000-0000-000000000000", + "stretch": false, + "userdefined_animFPS": false, + "userdefined_depth": false, + "visible": true, + "vspeed": 0, + "vtiled": false, + "x": 0, + "y": 0 + } + ], + "modelName": "GMRoom", + "parentId": "00000000-0000-0000-0000-000000000000", + "physicsSettings": { + "id": "3c45e07f-7d30-4651-b3c1-6f35df3075d7", + "inheritPhysicsSettings": false, + "modelName": "GMRoomPhysicsSettings", + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0, + "PhysicsWorldGravityY": 10, + "PhysicsWorldPixToMeters": 0.1, + "mvc": "1.0" + }, + "roomSettings": { + "id": "49bf8bc7-234e-4309-9293-e00533b714c6", + "Height": 1920, + "inheritRoomSettings": false, + "modelName": "GMRoomSettings", + "persistent": false, + "mvc": "1.0", + "Width": 1080 + }, + "mvc": "1.0", + "views": [ +{"id": "43ad6932-e118-41ca-b996-0689fc9341f4","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "7c379040-458e-4ef6-8016-15733a686a14","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "7630fe85-d3d9-4c7a-8bf3-2150a1e91b58","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "8ca59de9-1022-49fb-a87c-88deec9ec25a","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "ca679a02-4b04-4c3a-bb86-c0d027225e30","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "aff1f945-eac2-407f-8dcc-2236e969f7a9","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "f29db2a8-132c-4d4f-85c3-7523809424d3","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "a664e2d4-8e70-410c-8cea-c70c3dc24f48","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} + ], + "viewSettings": { + "id": "ca195829-de43-4c05-acf4-437b15d979d0", + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + "modelName": "GMRoomViewSettings", + "mvc": "1.0" + } +} \ No newline at end of file diff --git a/rooms/rm_StoreToys/rm_StoreToys.yy b/rooms/rm_StoreToys/rm_StoreToys.yy new file mode 100644 index 0000000..6ae53da --- /dev/null +++ b/rooms/rm_StoreToys/rm_StoreToys.yy @@ -0,0 +1,117 @@ + +{ + "name": "rm_StoreToys", + "id": "00ff2b8a-65e1-412b-b046-f6aff462dd90", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrderIDs": [ + "b470580a-0866-4bee-8781-6f99bb1b4c63" + ], + "IsDnD": false, + "layers": [ + { + "__type": "GMRInstanceLayer_Model:#YoYoStudio.MVCFormat", + "name": "Instances", + "id": "1e7cbaf9-3c6b-439b-aba7-7a86d5406634", + "depth": 0, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "instances": [ +{"name": "inst_1900C14B","id": "b470580a-0866-4bee-8781-6f99bb1b4c63","colour": { "Value": 4294967295 },"creationCodeFile": "","creationCodeType": "","ignore": false,"imageIndex": 0,"imageSpeed": 1,"inheritCode": false,"inheritItemSettings": false,"IsDnD": false,"m_originalParentID": "00000000-0000-0000-0000-000000000000","m_serialiseFrozen": false,"modelName": "GMRInstance","name_with_no_file_rename": "inst_1900C14B","objId": "5023793c-1056-45bf-ac29-911440787d46","properties": null,"rotation": 0,"scaleX": 1,"scaleY": 1,"mvc": "1.1","x": 32,"y": 1792} + ], + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRInstanceLayer", + "mvc": "1.0", + "userdefined_depth": false, + "visible": true + }, + { + "__type": "GMRBackgroundLayer_Model:#YoYoStudio.MVCFormat", + "name": "Background", + "id": "4e98a3b5-99d6-4c32-8a32-7df731b60351", + "animationFPS": 15, + "animationSpeedType": "0", + "colour": { "Value": 4294967295 }, + "depth": 100, + "grid_x": 32, + "grid_y": 32, + "hierarchyFrozen": false, + "hierarchyVisible": true, + "hspeed": 0, + "htiled": false, + "inheritLayerDepth": false, + "inheritLayerSettings": false, + "inheritSubLayers": false, + "inheritVisibility": false, + "layers": [ + + ], + "m_parentID": "00000000-0000-0000-0000-000000000000", + "m_serialiseFrozen": false, + "modelName": "GMRBackgroundLayer", + "mvc": "1.0", + "spriteId": "00000000-0000-0000-0000-000000000000", + "stretch": false, + "userdefined_animFPS": false, + "userdefined_depth": false, + "visible": true, + "vspeed": 0, + "vtiled": false, + "x": 0, + "y": 0 + } + ], + "modelName": "GMRoom", + "parentId": "00000000-0000-0000-0000-000000000000", + "physicsSettings": { + "id": "9669cd73-ed18-4e71-bef6-d0f9076f8036", + "inheritPhysicsSettings": false, + "modelName": "GMRoomPhysicsSettings", + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0, + "PhysicsWorldGravityY": 10, + "PhysicsWorldPixToMeters": 0.1, + "mvc": "1.0" + }, + "roomSettings": { + "id": "501c6234-9b14-469f-9379-5dfb1a353e15", + "Height": 1920, + "inheritRoomSettings": false, + "modelName": "GMRoomSettings", + "persistent": false, + "mvc": "1.0", + "Width": 1080 + }, + "mvc": "1.0", + "views": [ +{"id": "955becb6-1f7d-46ba-b343-93fb100fe5e2","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "7ad2adba-bc97-4ed4-8e02-c5639a91ee8f","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "75ed9e27-7fdb-44c3-b881-73e57872dbc0","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "3c24fc5a-3b47-4a64-b221-30d6028dfd3e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "0dfaf1d8-edd7-4b16-8144-a3045ee9bf7e","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "0d2a879c-8119-4ea9-babc-03eb7472bbb5","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "fe5ec55e-bcdc-4c12-b0cb-228d6ac1dbe6","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0}, +{"id": "8c80232b-7f94-4021-80a6-37010cbca9e9","hborder": 32,"hport": 768,"hspeed": -1,"hview": 768,"inherit": false,"modelName": "GMRView","objId": "00000000-0000-0000-0000-000000000000","mvc": "1.0","vborder": 32,"visible": false,"vspeed": -1,"wport": 1024,"wview": 1024,"xport": 0,"xview": 0,"yport": 0,"yview": 0} + ], + "viewSettings": { + "id": "6f2379e9-b9e9-4800-8123-900d6ec6f6e2", + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + "modelName": "GMRoomViewSettings", + "mvc": "1.0" + } +} \ No newline at end of file diff --git a/sprites/spr_Store_Food_Button/49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86.png b/sprites/spr_Store_Food_Button/49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f2170890128a24f217a2005fd1f4353fa68bc3 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA*=z2(XtCn9oRE?FEB)s3ZCSTK-V#Ny85}Sb4q9e03jPY AOaK4? literal 0 HcmV?d00001 diff --git a/sprites/spr_Store_Food_Button/layers/49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86/5b165aec-f4cc-47da-a9f0-d8b3d568a980.png b/sprites/spr_Store_Food_Button/layers/49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86/5b165aec-f4cc-47da-a9f0-d8b3d568a980.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f2170890128a24f217a2005fd1f4353fa68bc3 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA*=z2(XtCn9oRE?FEB)s3ZCSTK-V#Ny85}Sb4q9e03jPY AOaK4? literal 0 HcmV?d00001 diff --git a/sprites/spr_Store_Food_Button/spr_Store_Food_Button.yy b/sprites/spr_Store_Food_Button/spr_Store_Food_Button.yy new file mode 100644 index 0000000..2bcad8c --- /dev/null +++ b/sprites/spr_Store_Food_Button/spr_Store_Food_Button.yy @@ -0,0 +1,70 @@ +{ + "id": "63e45c47-2871-43a6-96da-06a9d230718b", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_Store_Food_Button", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "63e45c47-2871-43a6-96da-06a9d230718b", + "compositeImage": { + "id": "e936ddf0-56ea-4fc9-9708-55b7ed855b8c", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "0b2ef920-59db-4773-b047-568a12c96e62", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "49d06f2d-5d5d-4b62-80e3-fcf4d50e6e86", + "LayerId": "5b165aec-f4cc-47da-a9f0-d8b3d568a980" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "layers": [ + { + "id": "5b165aec-f4cc-47da-a9f0-d8b3d568a980", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "63e45c47-2871-43a6-96da-06a9d230718b", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 64, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/sprites/spr_Store_Pay_Button/5c202e80-72cf-4493-96a5-12164490938e.png b/sprites/spr_Store_Pay_Button/5c202e80-72cf-4493-96a5-12164490938e.png new file mode 100644 index 0000000000000000000000000000000000000000..274ab95e5b9f1ec0beffbfe36d9456a9dfea00f3 GIT binary patch literal 258 zcmV+d0sa1oP){^|}kx@X0L;+WPp5UBf$L#) zV%&&x_5zH+7yUDC{fbfS?#4|I_XIe=(w=KNZUDB0a6fcz!9By!ZK@~ZMrFZ6)UrR= z3V2YKV|cbYWZ>?a6iA_wpF07*qo IM6N<$f_TJoY5)KL literal 0 HcmV?d00001 diff --git a/sprites/spr_Store_Pay_Button/layers/5c202e80-72cf-4493-96a5-12164490938e/27fde5e8-71c4-4405-8ecb-5acf841e08c3.png b/sprites/spr_Store_Pay_Button/layers/5c202e80-72cf-4493-96a5-12164490938e/27fde5e8-71c4-4405-8ecb-5acf841e08c3.png new file mode 100644 index 0000000000000000000000000000000000000000..b86e7c5644f42b99183b9be163277e446fdb044f GIT binary patch literal 258 zcmV+d0sa1oP)(B3=mLQkaK|Q5UinDWbk~(d%IEFx+sEQz(}oMo)ks!a(O)+MR5zv3Z;W` z6q3wJv>I(UpFgemZ+0^+CbpZhn}$brlf@0$O~Ag8zOR%Uu=X%omdSt0Zdn+xw_5cD z>jwL%e0+|LM>6t)Lf4IeNM{hE&W+PIPGa&vS!Oxg()b z(`sr%?A)77ZWCCPx$RsP7$z}mrX5_##LFYv+M^KvkW)_JD2MSxL8-VK3=ygf)3k*D UM~O6C2O7rU>FVdQ&MBb@02Y`b3;+NC literal 0 HcmV?d00001 diff --git a/sprites/spr_Store_Toy_Ball/layers/f4e25dd8-b44c-4036-8ca3-047bbf2e0ada/2e985516-16da-48bd-8c42-7394000ab3ce.png b/sprites/spr_Store_Toy_Ball/layers/f4e25dd8-b44c-4036-8ca3-047bbf2e0ada/2e985516-16da-48bd-8c42-7394000ab3ce.png new file mode 100644 index 0000000000000000000000000000000000000000..6799ccf20ddd089ff2760d61db2569c2c53fc416 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4d3d@whE&W+{`vpEJu`=ak&%-` z27|_Vjzy6PU4E(wq3qL`HPa3*=U{OtQZUuA2wl*qxKQ9pX^owE^Z^b&?+u*>M{kH6 cVv=F7SgE@B^V_nOKr*=z2(XtCn9oRE?FEB)s3ZCSTK-V#Ny85}Sb4q9e03jPY AOaK4? literal 0 HcmV?d00001 diff --git a/sprites/spr_Store_Toy_Button/layers/0c5cd6a5-5108-429a-a431-5971038f6506/8bde6b74-452b-450f-b9ba-f2e2b4c73d70.png b/sprites/spr_Store_Toy_Button/layers/0c5cd6a5-5108-429a-a431-5971038f6506/8bde6b74-452b-450f-b9ba-f2e2b4c73d70.png new file mode 100644 index 0000000000000000000000000000000000000000..e3f2170890128a24f217a2005fd1f4353fa68bc3 GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=lRRA*=z2(XtCn9oRE?FEB)s3ZCSTK-V#Ny85}Sb4q9e03jPY AOaK4? literal 0 HcmV?d00001 diff --git a/sprites/spr_Store_Toy_Button/spr_Store_Toy_Button.yy b/sprites/spr_Store_Toy_Button/spr_Store_Toy_Button.yy new file mode 100644 index 0000000..b2456ed --- /dev/null +++ b/sprites/spr_Store_Toy_Button/spr_Store_Toy_Button.yy @@ -0,0 +1,70 @@ +{ + "id": "32a0ec0b-3c25-4440-8bf5-a944232ac352", + "modelName": "GMSprite", + "mvc": "1.12", + "name": "spr_Store_Toy_Button", + "For3D": false, + "HTile": false, + "VTile": false, + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxmode": 0, + "colkind": 1, + "coltolerance": 0, + "edgeFiltering": false, + "frames": [ + { + "id": "0c5cd6a5-5108-429a-a431-5971038f6506", + "modelName": "GMSpriteFrame", + "mvc": "1.0", + "SpriteId": "32a0ec0b-3c25-4440-8bf5-a944232ac352", + "compositeImage": { + "id": "decdc92c-02a8-4df6-8011-4af9d5b7b495", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0c5cd6a5-5108-429a-a431-5971038f6506", + "LayerId": "00000000-0000-0000-0000-000000000000" + }, + "images": [ + { + "id": "260783a8-de86-4f2b-bf36-d4bb7c7c05e2", + "modelName": "GMSpriteImage", + "mvc": "1.0", + "FrameId": "0c5cd6a5-5108-429a-a431-5971038f6506", + "LayerId": "8bde6b74-452b-450f-b9ba-f2e2b4c73d70" + } + ] + } + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "layers": [ + { + "id": "8bde6b74-452b-450f-b9ba-f2e2b4c73d70", + "modelName": "GMImageLayer", + "mvc": "1.0", + "SpriteId": "32a0ec0b-3c25-4440-8bf5-a944232ac352", + "blendMode": 0, + "isLocked": false, + "name": "default", + "opacity": 100, + "visible": true + } + ], + "origin": 0, + "originLocked": false, + "playbackSpeed": 15, + "playbackSpeedType": 0, + "premultiplyAlpha": false, + "sepmasks": false, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": "1225f6b0-ac20-43bd-a82e-be73fa0b6f4f", + "type": 0, + "width": 64, + "xorig": 0, + "yorig": 0 +} \ No newline at end of file diff --git a/views/75ae81e4-73cd-4939-908a-676d351c8602.yy b/views/75ae81e4-73cd-4939-908a-676d351c8602.yy index 5644b29..ee0e519 100644 --- a/views/75ae81e4-73cd-4939-908a-676d351c8602.yy +++ b/views/75ae81e4-73cd-4939-908a-676d351c8602.yy @@ -5,6 +5,7 @@ "name": "75ae81e4-73cd-4939-908a-676d351c8602", "children": [ "159ead98-6403-450c-8c75-f0095110279e", + "d715bace-a603-48a9-8d69-b9b3f6ee3029", "0d1e570d-af3c-4ae4-858a-2dc0e473c432", "148a5ef3-ef25-44c8-98b5-dc18305bdc90", "1c0beb1b-c82c-495d-9f8b-30f5f73e5fe5", diff --git a/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy b/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy index 5e00913..8efd170 100644 --- a/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy +++ b/views/c3602bdb-c350-4be2-bb1b-8e49a608ca8a.yy @@ -39,7 +39,11 @@ "15dff546-9cad-4db7-b401-16a142ebc9ee", "af324e47-2dc6-436e-92cd-9e8b9adbb66d", "2b967772-2c92-4be0-8848-11bb921d9c8f", - "df3c9ca1-c1bf-4ed3-b988-febedd0e8fec" + "df3c9ca1-c1bf-4ed3-b988-febedd0e8fec", + "5ba4a0e1-0adc-45d6-b83f-077c19b7bf80", + "49627d82-e041-440f-8c0e-a43d5c2da2c9", + "63e45c47-2871-43a6-96da-06a9d230718b", + "32a0ec0b-3c25-4440-8bf5-a944232ac352" ], "filterType": "GMSprite", "folderName": "sprites", diff --git a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy index 22ddf7e..a0d8525 100644 --- a/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy +++ b/views/dd2fc978-0a6f-4331-91a6-12060298c4e0.yy @@ -22,7 +22,14 @@ "1d707680-ea07-4150-b623-2483d81a1612", "a0c9838a-d9ba-47ab-9302-83b718a6afb3", "a697327e-b597-427c-9535-6594b2e50c02", - "96a0de7d-2eab-448e-8b4a-9bf97d3d5953" + "96a0de7d-2eab-448e-8b4a-9bf97d3d5953", + "15707364-5db0-4198-b5b0-36bcfb244932", + "3eb2283a-f44f-4b7c-83a5-0b9358d7508d", + "c4852add-a528-4793-9bca-300074b0a814", + "8e27ec92-4c63-4a81-86d5-b9a47a31c504", + "6527a792-3a28-4534-9405-0220578fff5a", + "fc383e14-438a-4cd2-b957-f1be645cebe3", + "5023793c-1056-45bf-ac29-911440787d46" ], "filterType": "GMObject", "folderName": "objects", diff --git a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy index f53c1b9..f47bc47 100644 --- a/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy +++ b/views/e397fd61-3040-4d63-a320-7d2e697fa442.yy @@ -11,8 +11,11 @@ "b5752279-c416-4f7b-b59f-80ebef7c0983", "adc2e71c-d722-44c0-aa2e-31bf3e74c897", "ea9b4683-0d5a-41f7-b0d3-479636b3507e", + "dd30ee2a-7fad-4905-9a51-999207f4804a", "b678606e-2787-4353-b3b1-3bbe71a6aaf3", - "dd30ee2a-7fad-4905-9a51-999207f4804a" + "00ff2b8a-65e1-412b-b046-f6aff462dd90", + "c7865271-2823-4ff2-8aab-5303a189c38f", + "d81ba1dc-478e-4772-9503-ee6dcfde9825" ], "filterType": "GMRoom", "folderName": "rooms",