diff --git a/Aggressive Avians.yyp b/Aggressive Avians.yyp index dc2281f..df43fa3 100644 --- a/Aggressive Avians.yyp +++ b/Aggressive Avians.yyp @@ -34,7 +34,7 @@ }, "name":"Aggressive Avians", "resources":[ - {"id":{"name":"platformer","path":"objects/platformer/platformer.yy",},}, + {"id":{"name":"obj_grass","path":"objects/obj_grass/obj_grass.yy",},}, {"id":{"name":"player","path":"objects/player/player.yy",},}, {"id":{"name":"Room1","path":"rooms/Room1/Room1.yy",},}, {"id":{"name":"crimson","path":"sprites/crimson/crimson.yy",},}, diff --git a/objects/platformer/platformer.yy b/objects/obj_grass/obj_grass.yy similarity index 81% rename from objects/platformer/platformer.yy rename to objects/obj_grass/obj_grass.yy index 77f503f..2b9b782 100644 --- a/objects/platformer/platformer.yy +++ b/objects/obj_grass/obj_grass.yy @@ -1,9 +1,9 @@ { "$GMObject":"", - "%Name":"platformer", + "%Name":"obj_grass", "eventList":[], "managed":true, - "name":"platformer", + "name":"obj_grass", "overriddenProperties":[], "parent":{ "name":"Objects", @@ -26,8 +26,11 @@ "properties":[], "resourceType":"GMObject", "resourceVersion":"2.0", - "solid":true, - "spriteId":null, + "solid":false, + "spriteId":{ + "name":"grass", + "path":"sprites/grass/grass.yy", + }, "spriteMaskId":null, "visible":true, } \ No newline at end of file diff --git a/objects/player/Create_0.gml b/objects/player/Create_0.gml index b49ee36..dace0ec 100644 --- a/objects/player/Create_0.gml +++ b/objects/player/Create_0.gml @@ -1,8 +1,14 @@ -/// @DnDAction : YoYo Games.Movement.move_and_collide +/// @DnDAction : YoYo Games.Common.Variable /// @DnDVersion : 1 -/// @DnDHash : 298D9BA3 -/// @DnDArgument : "xvel" "2" -/// @DnDArgument : "yvel" "2" -/// @DnDArgument : "object" "platformer" -/// @DnDSaveInfo : "object" "platformer" -move_and_collide(2, 2, platformer,4,0,0,-1,-1); \ No newline at end of file +/// @DnDHash : 44D05B1A +/// @DnDInput : 4 +/// @DnDArgument : "expr" "4" +/// @DnDArgument : "expr_1" "16" +/// @DnDArgument : "var" "move_speed" +/// @DnDArgument : "var_1" "jump_speed" +/// @DnDArgument : "var_2" "move_x" +/// @DnDArgument : "var_3" "move_y" +move_speed = 4; +jump_speed = 16; +move_x = 0; +move_y = 0; \ No newline at end of file diff --git a/objects/player/Step_0.gml b/objects/player/Step_0.gml new file mode 100644 index 0000000..d2011b7 --- /dev/null +++ b/objects/player/Step_0.gml @@ -0,0 +1,79 @@ +/// @DnDAction : YoYo Games.Common.Variable +/// @DnDVersion : 1 +/// @DnDHash : 34BF93A5 +/// @DnDInput : 2 +/// @DnDArgument : "expr" "keyboard_check(vk_right) - keyboard_check(vk_left)" +/// @DnDArgument : "expr_1" "move_x * move_speed" +/// @DnDArgument : "var" "move_x" +/// @DnDArgument : "var_1" "move_x" +move_x = keyboard_check(vk_right) - keyboard_check(vk_left); +move_x = move_x * move_speed; + +/// @DnDAction : YoYo Games.Collisions.If_Object_At +/// @DnDVersion : 1.1 +/// @DnDHash : 494A049B +/// @DnDArgument : "x_relative" "1" +/// @DnDArgument : "y" "2" +/// @DnDArgument : "y_relative" "1" +/// @DnDArgument : "object" "obj_grass" +/// @DnDSaveInfo : "object" "obj_grass" +var l494A049B_0 = instance_place(x + 0, y + 2, [obj_grass]); if ((l494A049B_0 > 0)) { /// @DnDAction : YoYo Games.Common.Variable + /// @DnDVersion : 1 + /// @DnDHash : 64AD3710 + /// @DnDParent : 494A049B + /// @DnDArgument : "var" "move_y" + move_y = 0; + + /// @DnDAction : YoYo Games.Mouse & Keyboard.If_Key_Down + /// @DnDVersion : 1 + /// @DnDHash : 79991EE3 + /// @DnDParent : 494A049B + var l79991EE3_0; l79991EE3_0 = keyboard_check(vk_space); if (l79991EE3_0) { /// @DnDAction : YoYo Games.Common.Variable + /// @DnDVersion : 1 + /// @DnDHash : 7E650206 + /// @DnDParent : 79991EE3 + /// @DnDArgument : "expr" "-jump_speed" + /// @DnDArgument : "var" "move_y" + move_y = -jump_speed; } } + +/// @DnDAction : YoYo Games.Common.Else +/// @DnDVersion : 1 +/// @DnDHash : 15C6CBAD +else { /// @DnDAction : YoYo Games.Common.If_Variable + /// @DnDVersion : 1 + /// @DnDHash : 6AA2EA0B + /// @DnDParent : 15C6CBAD + /// @DnDArgument : "var" "move_y" + /// @DnDArgument : "op" "1" + /// @DnDArgument : "value" "10" + if(move_y < 10) { /// @DnDAction : YoYo Games.Common.Variable + /// @DnDVersion : 1 + /// @DnDHash : 458EFD55 + /// @DnDParent : 6AA2EA0B + /// @DnDArgument : "expr" "1" + /// @DnDArgument : "var" "move_y" + move_y = 1; } } + +/// @DnDAction : YoYo Games.Movement.move_and_collide +/// @DnDVersion : 1 +/// @DnDHash : 5E3ED0F6 +/// @DnDArgument : "xvel" "move_x" +/// @DnDArgument : "yvel" "move_y" +/// @DnDArgument : "maxxmove" "0" +/// @DnDArgument : "maxymove" "0" +/// @DnDArgument : "object" "obj_grass" +/// @DnDSaveInfo : "object" "obj_grass" +move_and_collide(move_x, move_y, obj_grass,4,0,0,0,0); + +/// @DnDAction : YoYo Games.Common.If_Variable +/// @DnDVersion : 1 +/// @DnDHash : 5A51BEC1 +/// @DnDArgument : "var" "move_x" +/// @DnDArgument : "not" "1" +if(!(move_x == 0)) { /// @DnDAction : YoYo Games.Common.Variable + /// @DnDVersion : 1 + /// @DnDHash : 38DDDEF6 + /// @DnDParent : 5A51BEC1 + /// @DnDArgument : "expr" "sign(move_x)" + /// @DnDArgument : "var" "image_xscale" + image_xscale = sign(move_x); } \ No newline at end of file diff --git a/objects/player/player.yy b/objects/player/player.yy index 4c56db0..bed1312 100644 --- a/objects/player/player.yy +++ b/objects/player/player.yy @@ -3,6 +3,7 @@ "%Name":"player", "eventList":[ {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":true,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, + {"$GMEvent":"v1","%Name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":true,"name":"","resourceType":"GMEvent","resourceVersion":"2.0",}, ], "managed":true, "name":"player", diff --git a/rooms/Room1/Room1.yy b/rooms/Room1/Room1.yy index 7c33417..0159a84 100644 --- a/rooms/Room1/Room1.yy +++ b/rooms/Room1/Room1.yy @@ -12,11 +12,6 @@ ], "isDnd":false, "layers":[ - {"$GMRInstanceLayer":"","%Name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ - {"$GMRInstance":"v1","%Name":"inst_5068146F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5068146F","objectId":{"name":"platformer","path":"objects/platformer/platformer.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":89.0,"scaleY":5.0,"x":0.0,"y":704.0,}, - {"$GMRInstance":"v1","%Name":"inst_68EFB1BF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_68EFB1BF","objectId":{"name":"platformer","path":"objects/platformer/platformer.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":35.0,"scaleY":5.0,"x":832.0,"y":640.0,}, - {"$GMRInstance":"v1","%Name":"inst_21CE61C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21CE61C9","objectId":{"name":"player","path":"objects/player/player.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":608.0,}, - ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, {"$GMRAssetLayer":"","%Name":"Assets_1","assets":[ {"$GMRSpriteGraphic":"","%Name":"graphic_74CE0345","animationSpeed":1.0,"colour":4294967295,"frozen":false,"headPosition":0.0,"ignore":false,"inheritedItemId":null,"inheritItemSettings":false,"name":"graphic_74CE0345","resourceType":"GMRSpriteGraphic","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"spriteId":{"name":"grass","path":"sprites/grass/grass.yy",},"x":0.0,"y":704.0,}, {"$GMRSpriteGraphic":"","%Name":"graphic_A32C8F1","animationSpeed":1.0,"colour":4294967295,"frozen":false,"headPosition":0.0,"ignore":false,"inheritedItemId":null,"inheritItemSettings":false,"name":"graphic_A32C8F1","resourceType":"GMRSpriteGraphic","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"spriteId":{"name":"grass","path":"sprites/grass/grass.yy",},"x":64.0,"y":704.0,}, @@ -50,7 +45,12 @@ {"$GMRSpriteGraphic":"","%Name":"graphic_69DE350A","animationSpeed":1.0,"colour":4294967295,"frozen":false,"headPosition":0.0,"ignore":false,"inheritedItemId":null,"inheritItemSettings":false,"name":"graphic_69DE350A","resourceType":"GMRSpriteGraphic","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"spriteId":{"name":"dirt","path":"sprites/dirt/dirt.yy",},"x":1344.0,"y":704.0,}, {"$GMRSpriteGraphic":"","%Name":"graphic_5776D498","animationSpeed":1.0,"colour":4294967295,"frozen":false,"headPosition":0.0,"ignore":false,"inheritedItemId":null,"inheritItemSettings":false,"name":"graphic_5776D498","resourceType":"GMRSpriteGraphic","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"spriteId":{"name":"dirt","path":"sprites/dirt/dirt.yy",},"x":1280.0,"y":704.0,}, {"$GMRSpriteGraphic":"","%Name":"graphic_1B89E9C2","animationSpeed":1.0,"colour":4294967295,"frozen":false,"headPosition":0.0,"ignore":false,"inheritedItemId":null,"inheritItemSettings":false,"name":"graphic_1B89E9C2","resourceType":"GMRSpriteGraphic","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"spriteId":{"name":"dirt","path":"sprites/dirt/dirt.yy",},"x":1216.0,"y":704.0,}, - ],"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Assets_1","properties":[],"resourceType":"GMRAssetLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + ],"depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Assets_1","properties":[],"resourceType":"GMRAssetLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, + {"$GMRInstanceLayer":"","%Name":"Instances","depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"$GMRInstance":"v1","%Name":"inst_5068146F","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_5068146F","objectId":{"name":"obj_grass","path":"objects/obj_grass/obj_grass.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":89.0,"scaleY":5.0,"x":0.0,"y":704.0,}, + {"$GMRInstance":"v1","%Name":"inst_68EFB1BF","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_68EFB1BF","objectId":{"name":"obj_grass","path":"objects/obj_grass/obj_grass.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":35.0,"scaleY":5.0,"x":832.0,"y":640.0,}, + {"$GMRInstance":"v1","%Name":"inst_21CE61C9","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"name":"inst_21CE61C9","objectId":{"name":"player","path":"objects/player/player.yy",},"properties":[],"resourceType":"GMRInstance","resourceVersion":"2.0","rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":96.0,"y":608.0,}, + ],"layers":[],"name":"Instances","properties":[],"resourceType":"GMRInstanceLayer","resourceVersion":"2.0","userdefinedDepth":false,"visible":true,}, {"$GMRBackgroundLayer":"","%Name":"Backgrounds_1","animationFPS":15.0,"animationSpeedType":0,"colour":4279769112,"depth":200,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Backgrounds_1","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, {"$GMRBackgroundLayer":"","%Name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4278190080,"depth":300,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"name":"Background","properties":[],"resourceType":"GMRBackgroundLayer","resourceVersion":"2.0","spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ],