diff --git a/Y1B2 Game.yyp b/Y1B2 Game.yyp index c5714d0..ef6c8f3 100644 --- a/Y1B2 Game.yyp +++ b/Y1B2 Game.yyp @@ -5,16 +5,13 @@ "resources": [ {"id":{"name":"spr_plr1_jump_right","path":"sprites/spr_plr1_jump_right/spr_plr1_jump_right.yy",},"order":15,}, {"id":{"name":"spr_door","path":"sprites/spr_door/spr_door.yy",},"order":2,}, + {"id":{"name":"rm_controls","path":"rooms/rm_controls/rm_controls.yy",},"order":1,}, {"id":{"name":"obj_par_item","path":"objects/obj_par_item/obj_par_item.yy",},"order":0,}, {"id":{"name":"obj_bridge_segment_4_off","path":"objects/obj_bridge_segment_4_off/obj_bridge_segment_4_off.yy",},"order":7,}, {"id":{"name":"spr_plr1_walk_left","path":"sprites/spr_plr1_walk_left/spr_plr1_walk_left.yy",},"order":12,}, {"id":{"name":"obj_bridge_controller","path":"objects/obj_bridge_controller/obj_bridge_controller.yy",},"order":0,}, -<<<<<<< Updated upstream - {"id":{"name":"rm_puzzle03","path":"rooms/rm_puzzle03/rm_puzzle03.yy",},"order":1,}, -======= {"id":{"name":"rm_puzzle03","path":"rooms/rm_puzzle03/rm_puzzle03.yy",},"order":3,}, {"id":{"name":"spr_button_go_back","path":"sprites/spr_button_go_back/spr_button_go_back.yy",},"order":7,}, ->>>>>>> Stashed changes {"id":{"name":"obj_button_play","path":"objects/obj_button_play/obj_button_play.yy",},"order":1,}, {"id":{"name":"spr_switch_floor","path":"sprites/spr_switch_floor/spr_switch_floor.yy",},"order":6,}, {"id":{"name":"spr_plr2_push_right","path":"sprites/spr_plr2_push_right/spr_plr2_push_right.yy",},"order":16,}, @@ -49,11 +46,8 @@ {"id":{"name":"spr_box","path":"sprites/spr_box/spr_box.yy",},"order":0,}, {"id":{"name":"obj_bridge_switch_34","path":"objects/obj_bridge_switch_34/obj_bridge_switch_34.yy",},"order":14,}, {"id":{"name":"spr_button_resume","path":"sprites/spr_button_resume/spr_button_resume.yy",},"order":4,}, -<<<<<<< Updated upstream {"id":{"name":"spr_bad","path":"sprites/spr_bad/spr_bad.yy",},"order":9,}, -======= {"id":{"name":"obj_button_go_back","path":"objects/obj_button_go_back/obj_button_go_back.yy",},"order":0,}, ->>>>>>> Stashed changes {"id":{"name":"sfx_plr2_meow","path":"sounds/sfx_plr2_meow/sfx_plr2_meow.yy",},"order":0,}, {"id":{"name":"backstory07","path":"sprites/backstory07/backstory07.yy",},"order":8,}, {"id":{"name":"backstory04","path":"sprites/backstory04/backstory04.yy",},"order":11,}, @@ -132,12 +126,7 @@ {"id":{"name":"scr_seqControl","path":"scripts/scr_seqControl/scr_seqControl.yy",},"order":1,}, {"id":{"name":"rm_puzzle02","path":"rooms/rm_puzzle02/rm_puzzle02.yy",},"order":3,}, {"id":{"name":"obj_button_controls","path":"objects/obj_button_controls/obj_button_controls.yy",},"order":0,}, -<<<<<<< Updated upstream - {"id":{"name":"rm_controls","path":"rooms/rm_controls/rm_controls.yy",},"order":1,}, -======= {"id":{"name":"spr_button_leave","path":"sprites/spr_button_leave/spr_button_leave.yy",},"order":8,}, - {"id":{"name":"rm_controls","path":"rooms/rm_controls/rm_controls.yy",},"order":2,}, ->>>>>>> Stashed changes {"id":{"name":"font_main","path":"fonts/font_main/font_main.yy",},"order":0,}, {"id":{"name":"tileset_small","path":"sprites/tileset_small/tileset_small.yy",},"order":1,}, {"id":{"name":"sfx_plr2_jump_1","path":"sounds/sfx_plr2_jump_1/sfx_plr2_jump_1.yy",},"order":1,}, @@ -184,28 +173,18 @@ "children": [], }, "RoomOrderNodes": [ -<<<<<<< Updated upstream {"groupName":"Puzzle Rooms","children":[ {"roomId":{"name":"rm_puzzle00","path":"rooms/rm_puzzle00/rm_puzzle00.yy",},}, {"roomId":{"name":"rm_puzzle01","path":"rooms/rm_puzzle01/rm_puzzle01.yy",},}, {"roomId":{"name":"rm_puzzle02","path":"rooms/rm_puzzle02/rm_puzzle02.yy",},}, {"roomId":{"name":"rm_puzzle03","path":"rooms/rm_puzzle03/rm_puzzle03.yy",},}, ],}, -======= - {"roomId":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},}, ->>>>>>> Stashed changes {"groupName":"Menus","children":[ {"roomId":{"name":"rm_title","path":"rooms/rm_title/rm_title.yy",},}, - {"roomId":{"name":"rm_controls","path":"rooms/rm_controls/rm_controls.yy",},}, - ],}, -<<<<<<< Updated upstream -======= - {"groupName":"Puzzle Rooms","children":[ - {"roomId":{"name":"rm_puzzle00","path":"rooms/rm_puzzle00/rm_puzzle00.yy",},}, - {"roomId":{"name":"rm_puzzle03","path":"rooms/rm_puzzle03/rm_puzzle03.yy",},}, - ],}, ->>>>>>> Stashed changes + {}, + ]}, {"roomId":{"name":"rm_graybox","path":"rooms/rm_graybox/rm_graybox.yy",},}, + {"roomId":{"name":"rm_controls","path":"rooms/rm_controls/rm_controls.yy",},}, ], "Folders": [ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Animation Curves","folderPath":"folders/Animation Curves.yy","order":12,}, @@ -221,6 +200,7 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Players","folderPath":"folders/Objects/Players.yy","order":2,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"UI","folderPath":"folders/Objects/UI.yy","order":4,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Controls","folderPath":"folders/Objects/UI/Controls.yy","order":4,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"End screen","folderPath":"folders/Objects/UI/End screen.yy","order":3,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Title Screen","folderPath":"folders/Objects/UI/Title Screen.yy","order":2,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Paths","folderPath":"folders/Paths.yy","order":3,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Rooms","folderPath":"folders/Rooms.yy","order":8,}, @@ -239,6 +219,7 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"UI","folderPath":"folders/Sounds/UI.yy","order":2,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Sprites","folderPath":"folders/Sprites.yy","order":0,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Backstory","folderPath":"folders/Sprites/Backstory.yy","order":6,}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Dogs","folderPath":"folders/Sprites/Dogs.yy","order":11,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Interactables","folderPath":"folders/Sprites/Interactables.yy","order":2,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Boxes","folderPath":"folders/Sprites/Interactables/Boxes.yy","order":3,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Carryable Objects","folderPath":"folders/Sprites/Interactables/Carryable Objects.yy","order":0,}, @@ -249,11 +230,6 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"UI","folderPath":"folders/Sprites/UI.yy","order":3,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Tile Sets","folderPath":"folders/Tile Sets.yy","order":2,}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Timelines","folderPath":"folders/Timelines.yy","order":8,}, -<<<<<<< Updated upstream - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Dogs","folderPath":"folders/Sprites/Dogs.yy","order":11,}, -======= - {"resourceType":"GMFolder","resourceVersion":"1.0","name":"End screen","folderPath":"folders/Objects/UI/End screen.yy","order":3,}, ->>>>>>> Stashed changes ], "AudioGroups": [ {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, diff --git a/rooms/rm_controls/rm_controls.yy b/rooms/rm_controls/rm_controls.yy index 557c13b..94d305a 100644 --- a/rooms/rm_controls/rm_controls.yy +++ b/rooms/rm_controls/rm_controls.yy @@ -16,37 +16,19 @@ {"inherit":false,"visible":false,"xview":0,"yview":0,"wview":1366,"hview":768,"xport":0,"yport":0,"wport":1366,"hport":768,"hborder":32,"vborder":32,"hspeed":-1,"vspeed":-1,"objectId":null,}, ], "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","instances":[ -<<<<<<< Updated upstream - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_2D3C5D3D","properties":[],"isDnd":false,"objectId":{"name":"obj_button_exit","path":"objects/obj_button_exit/obj_button_exit.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":0.6588875,"scaleY":0.65888757,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":287.99997,"y":992.0,}, -======= - {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_38D7C0","properties":[],"isDnd":false,"objectId":{"name":"obj_control","path":"objects/obj_control/obj_control.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":-32.0,"y":1088.0,}, ->>>>>>> Stashed changes - ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - {"resourceType":"GMRAssetLayer","resourceVersion":"1.0","name":"Assets","assets":[ - {"resourceType":"GMRSpriteGraphic","resourceVersion":"1.0","name":"graphic_4839F92B","spriteId":{"name":"spr_plr1_spin","path":"sprites/spr_plr1_spin/spr_plr1_spin.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":0.60212666,"scaleY":0.6021267,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1600.0,"y":800.0,}, - {"resourceType":"GMRSpriteGraphic","resourceVersion":"1.0","name":"graphic_38D7B139","spriteId":{"name":"spr_plr2_spin","path":"sprites/spr_plr2_spin/spr_plr2_spin.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":0.60212666,"scaleY":0.6021267,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":733.9593,"y":802.72217,}, - {"resourceType":"GMRSpriteGraphic","resourceVersion":"1.0","name":"graphic_3DA19860","spriteId":{"name":"spr_controls_plr1","path":"sprites/spr_controls_plr1/spr_controls_plr1.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":0.60212666,"scaleY":0.6021267,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1234.9287,"y":32.0,}, - {"resourceType":"GMRSpriteGraphic","resourceVersion":"1.0","name":"graphic_C1295D9","spriteId":{"name":"spr_controls_plr2","path":"sprites/spr_controls_plr2/spr_controls_plr2.yy",},"headPosition":0.0,"rotation":0.0,"scaleX":0.60212666,"scaleY":0.6021267,"animationSpeed":1.0,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":480.0,"y":32.0,}, - ],"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":30.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":200,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","instances":[],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritVisibility":true,"inheritSubLayers":true,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"effectEnabled":true,"effectType":null,"properties":[],}, ], "inheritLayers": false, "creationCodeFile": "", "inheritCode": false, - "instanceCreationOrder": [ -<<<<<<< Updated upstream - {"name":"inst_2D3C5D3D","path":"rooms/rm_controls/rm_controls.yy",}, -======= - {"name":"inst_38D7C0","path":"rooms/rm_controls/rm_controls.yy",}, ->>>>>>> Stashed changes - ], + "instanceCreationOrder": [], "inheritCreationOrder": false, "sequenceId": null, "roomSettings": { "inheritRoomSettings": false, - "Width": 1920, - "Height": 1080, + "Width": 1366, + "Height": 768, "persistent": false, }, "viewSettings": {