diff --git a/Hale New Clear Path - Demo.resource_order b/Hale - New Clear Path.resource_order similarity index 59% rename from Hale New Clear Path - Demo.resource_order rename to Hale - New Clear Path.resource_order index 8351525..881b564 100644 --- a/Hale New Clear Path - Demo.resource_order +++ b/Hale - New Clear Path.resource_order @@ -5,6 +5,8 @@ {"name":"Fonts","order":6,"path":"folders/Fonts.yy",}, {"name":"Notes","order":11,"path":"folders/Notes.yy",}, {"name":"Objects","order":8,"path":"folders/Objects.yy",}, + {"name":"obj_buttons","order":26,"path":"folders/Objects/obj_buttons.yy",}, + {"name":"obj_enemy","order":27,"path":"folders/Objects/obj_enemy.yy",}, {"name":"Particle Systems","order":13,"path":"folders/Particle Systems.yy",}, {"name":"Paths","order":3,"path":"folders/Paths.yy",}, {"name":"Scripts","order":4,"path":"folders/Scripts.yy",}, @@ -13,41 +15,62 @@ {"name":"Sounds","order":2,"path":"folders/Sounds.yy",}, {"name":"Tile Sets","order":1,"path":"folders/Tile Sets.yy",}, {"name":"Timelines","order":7,"path":"folders/Timelines.yy",}, + {"name":"obj_text","order":30,"path":"folders/Objects/obj_text.yy",}, ], "ResourceOrderSettings": [ + {"name":"spr_tempbackground","order":2,"path":"sprites/spr_tempbackground/spr_tempbackground.yy",}, + {"name":"obj_buttonPlay","order":2,"path":"objects/obj_buttonPlay/obj_buttonPlay.yy",}, {"name":"spr_explosion1","order":14,"path":"sprites/spr_explosion1/spr_explosion1.yy",}, {"name":"obj_boss","order":11,"path":"objects/obj_boss/obj_boss.yy",}, {"name":"spr_enemy1","order":8,"path":"sprites/spr_enemy1/spr_enemy1.yy",}, {"name":"spr_rockbg","order":5,"path":"sprites/spr_rockbg/spr_rockbg.yy",}, + {"name":"spr_button","order":20,"path":"sprites/spr_button/spr_button.yy",}, {"name":"obj_spawnEnemy2","order":12,"path":"objects/obj_spawnEnemy2/obj_spawnEnemy2.yy",}, - {"name":"obj_enemy5","order":5,"path":"objects/obj_enemy5/obj_enemy5.yy",}, - {"name":"obj_enemy3","order":3,"path":"objects/obj_enemy3/obj_enemy3.yy",}, + {"name":"obj_enemy5","order":4,"path":"objects/obj_enemy5/obj_enemy5.yy",}, + {"name":"spr_enemy4","order":17,"path":"sprites/spr_enemy4/spr_enemy4.yy",}, + {"name":"obj_enemy3","order":2,"path":"objects/obj_enemy3/obj_enemy3.yy",}, {"name":"obj_enemyBullet1","order":8,"path":"objects/obj_enemyBullet1/obj_enemyBullet1.yy",}, + {"name":"obj_story","order":2,"path":"objects/obj_story/obj_story.yy",}, {"name":"obj_playerBullet1","order":7,"path":"objects/obj_playerBullet1/obj_playerBullet1.yy",}, + {"name":"obj_buttonCredits","order":5,"path":"objects/obj_buttonCredits/obj_buttonCredits.yy",}, {"name":"obj_spawnEnemy1","order":9,"path":"objects/obj_spawnEnemy1/obj_spawnEnemy1.yy",}, {"name":"obj_game","order":6,"path":"objects/obj_game/obj_game.yy",}, {"name":"obj_spawnMiniBoss","order":14,"path":"objects/obj_spawnMiniBoss/obj_spawnMiniBoss.yy",}, {"name":"spr_enemy2","order":9,"path":"sprites/spr_enemy2/spr_enemy2.yy",}, - {"name":"rm_testing","order":1,"path":"rooms/rm_testing/rm_testing.yy",}, + {"name":"obj_PUhealth","order":19,"path":"objects/obj_PUhealth/obj_PUhealth.yy",}, {"name":"snd_explosion1","order":1,"path":"sounds/snd_explosion1/snd_explosion1.yy",}, {"name":"obj_miniBoss","order":10,"path":"objects/obj_miniBoss/obj_miniBoss.yy",}, + {"name":"obj_buttonMenu","order":6,"path":"objects/obj_buttonMenu/obj_buttonMenu.yy",}, + {"name":"obj_buttonStory","order":3,"path":"objects/obj_buttonStory/obj_buttonStory.yy",}, {"name":"tileset_underground","order":1,"path":"tilesets/tileset_underground/tileset_underground.yy",}, + {"name":"spr_healthPowerUp","order":19,"path":"sprites/spr_healthPowerUp/spr_healthPowerUp.yy",}, + {"name":"spr_directions","order":22,"path":"sprites/spr_directions/spr_directions.yy",}, {"name":"spr_player","order":1,"path":"sprites/spr_player/spr_player.yy",}, - {"name":"obj_enemy2","order":2,"path":"objects/obj_enemy2/obj_enemy2.yy",}, + {"name":"obj_enemy2","order":1,"path":"objects/obj_enemy2/obj_enemy2.yy",}, + {"name":"obj_buttonParent","order":1,"path":"objects/obj_buttonParent/obj_buttonParent.yy",}, + {"name":"rm_tutorial","order":4,"path":"rooms/rm_tutorial/rm_tutorial.yy",}, + {"name":"rm_menu","order":2,"path":"rooms/rm_menu/rm_menu.yy",}, {"name":"spr_enemy3","order":11,"path":"sprites/spr_enemy3/spr_enemy3.yy",}, {"name":"obj_spawnEnemy3","order":15,"path":"objects/obj_spawnEnemy3/obj_spawnEnemy3.yy",}, - {"name":"obj_enemy1","order":1,"path":"objects/obj_enemy1/obj_enemy1.yy",}, {"name":"spr_space","order":6,"path":"sprites/spr_space/spr_space.yy",}, + {"name":"spr_pressed","order":21,"path":"sprites/spr_pressed/spr_pressed.yy",}, + {"name":"obj_buttonTutorial","order":4,"path":"objects/obj_buttonTutorial/obj_buttonTutorial.yy",}, + {"name":"spr_enemy5","order":18,"path":"sprites/spr_enemy5/spr_enemy5.yy",}, {"name":"obj_miniBossBullet","order":17,"path":"objects/obj_miniBossBullet/obj_miniBossBullet.yy",}, + {"name":"rm_credits","order":3,"path":"rooms/rm_credits/rm_credits.yy",}, {"name":"spr_miniBoss","order":13,"path":"sprites/spr_miniBoss/spr_miniBoss.yy",}, {"name":"spr_boss","order":14,"path":"sprites/spr_boss/spr_boss.yy",}, + {"name":"rm_story","order":5,"path":"rooms/rm_story/rm_story.yy",}, {"name":"spr_rock_big","order":2,"path":"sprites/spr_rock_big/spr_rock_big.yy",}, + {"name":"obj_PUmoreBullets","order":20,"path":"objects/obj_PUmoreBullets/obj_PUmoreBullets.yy",}, {"name":"spr_ground","order":4,"path":"sprites/spr_ground/spr_ground.yy",}, {"name":"obj_enemyBullet2","order":13,"path":"objects/obj_enemyBullet2/obj_enemyBullet2.yy",}, + {"name":"spr_glowPlayer","order":16,"path":"sprites/spr_glowPlayer/spr_glowPlayer.yy",}, {"name":"spr_enemyBullet1","order":10,"path":"sprites/spr_enemyBullet1/spr_enemyBullet1.yy",}, {"name":"obj_explosion1","order":18,"path":"objects/obj_explosion1/obj_explosion1.yy",}, {"name":"spr_sky","order":7,"path":"sprites/spr_sky/spr_sky.yy",}, - {"name":"obj_enemy4","order":4,"path":"objects/obj_enemy4/obj_enemy4.yy",}, + {"name":"obj_enemy4","order":3,"path":"objects/obj_enemy4/obj_enemy4.yy",}, + {"name":"obj_tutorial","order":1,"path":"objects/obj_tutorial/obj_tutorial.yy",}, {"name":"spr_rock_small","order":3,"path":"sprites/spr_rock_small/spr_rock_small.yy",}, {"name":"spr_enemyBullet3","order":12,"path":"sprites/spr_enemyBullet3/spr_enemyBullet3.yy",}, ], diff --git a/Hale New Clear Path - Demo.yyp b/Hale - New Clear Path.yyp similarity index 67% rename from Hale New Clear Path - Demo.yyp rename to Hale - New Clear Path.yyp index 1b65ca4..a54b2ec 100644 --- a/Hale New Clear Path - Demo.yyp +++ b/Hale - New Clear Path.yyp @@ -1,7 +1,7 @@ { "resourceType": "GMProject", "resourceVersion": "1.7", - "name": "Hale New Clear Path - Demo", + "name": "Hale - New Clear Path", "AudioGroups": [ {"resourceType":"GMAudioGroup","resourceVersion":"1.3","name":"audiogroup_default","targets":-1,}, ], @@ -16,6 +16,8 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Fonts","folderPath":"folders/Fonts.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Notes","folderPath":"folders/Notes.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Objects","folderPath":"folders/Objects.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"obj_buttons","folderPath":"folders/Objects/obj_buttons.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"obj_enemy","folderPath":"folders/Objects/obj_enemy.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Particle Systems","folderPath":"folders/Particle Systems.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Paths","folderPath":"folders/Paths.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Rooms","folderPath":"folders/Rooms.yy",}, @@ -26,6 +28,7 @@ {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Sprites","folderPath":"folders/Sprites.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Tile Sets","folderPath":"folders/Tile Sets.yy",}, {"resourceType":"GMFolder","resourceVersion":"1.0","name":"Timelines","folderPath":"folders/Timelines.yy",}, + {"resourceType":"GMFolder","resourceVersion":"1.0","name":"obj_text","folderPath":"folders/Objects/obj_text.yy",}, ], "IncludedFiles": [], "isEcma": false, @@ -34,51 +37,78 @@ "IDEVersion": "2023.11.1.129", }, "resources": [ + {"id":{"name":"spr_tempbackground","path":"sprites/spr_tempbackground/spr_tempbackground.yy",},}, + {"id":{"name":"obj_buttonPlay","path":"objects/obj_buttonPlay/obj_buttonPlay.yy",},}, {"id":{"name":"spr_explosion1","path":"sprites/spr_explosion1/spr_explosion1.yy",},}, {"id":{"name":"obj_boss","path":"objects/obj_boss/obj_boss.yy",},}, {"id":{"name":"spr_enemy1","path":"sprites/spr_enemy1/spr_enemy1.yy",},}, {"id":{"name":"spr_rockbg","path":"sprites/spr_rockbg/spr_rockbg.yy",},}, + {"id":{"name":"spr_button","path":"sprites/spr_button/spr_button.yy",},}, {"id":{"name":"obj_spawnEnemy2","path":"objects/obj_spawnEnemy2/obj_spawnEnemy2.yy",},}, {"id":{"name":"obj_enemy5","path":"objects/obj_enemy5/obj_enemy5.yy",},}, + {"id":{"name":"spr_enemy4","path":"sprites/spr_enemy4/spr_enemy4.yy",},}, {"id":{"name":"obj_enemy3","path":"objects/obj_enemy3/obj_enemy3.yy",},}, {"id":{"name":"obj_enemyBullet1","path":"objects/obj_enemyBullet1/obj_enemyBullet1.yy",},}, + {"id":{"name":"obj_story","path":"objects/obj_story/obj_story.yy",},}, {"id":{"name":"obj_playerBullet1","path":"objects/obj_playerBullet1/obj_playerBullet1.yy",},}, + {"id":{"name":"obj_buttonCredits","path":"objects/obj_buttonCredits/obj_buttonCredits.yy",},}, {"id":{"name":"obj_spawnEnemy1","path":"objects/obj_spawnEnemy1/obj_spawnEnemy1.yy",},}, {"id":{"name":"obj_game","path":"objects/obj_game/obj_game.yy",},}, {"id":{"name":"obj_spawnMiniBoss","path":"objects/obj_spawnMiniBoss/obj_spawnMiniBoss.yy",},}, {"id":{"name":"spr_enemy2","path":"sprites/spr_enemy2/spr_enemy2.yy",},}, - {"id":{"name":"rm_testing","path":"rooms/rm_testing/rm_testing.yy",},}, + {"id":{"name":"obj_PUhealth","path":"objects/obj_PUhealth/obj_PUhealth.yy",},}, {"id":{"name":"snd_explosion1","path":"sounds/snd_explosion1/snd_explosion1.yy",},}, {"id":{"name":"obj_miniBoss","path":"objects/obj_miniBoss/obj_miniBoss.yy",},}, + {"id":{"name":"fnt_menu","path":"fonts/fnt_menu/fnt_menu.yy",},}, + {"id":{"name":"obj_buttonMenu","path":"objects/obj_buttonMenu/obj_buttonMenu.yy",},}, + {"id":{"name":"obj_buttonStory","path":"objects/obj_buttonStory/obj_buttonStory.yy",},}, {"id":{"name":"tileset_underground","path":"tilesets/tileset_underground/tileset_underground.yy",},}, + {"id":{"name":"spr_healthPowerUp","path":"sprites/spr_healthPowerUp/spr_healthPowerUp.yy",},}, + {"id":{"name":"spr_directions","path":"sprites/spr_directions/spr_directions.yy",},}, {"id":{"name":"spr_player","path":"sprites/spr_player/spr_player.yy",},}, {"id":{"name":"obj_enemy2","path":"objects/obj_enemy2/obj_enemy2.yy",},}, + {"id":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},}, + {"id":{"name":"rm_tutorial","path":"rooms/rm_tutorial/rm_tutorial.yy",},}, + {"id":{"name":"rm_menu","path":"rooms/rm_menu/rm_menu.yy",},}, {"id":{"name":"spr_enemy3","path":"sprites/spr_enemy3/spr_enemy3.yy",},}, {"id":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},}, {"id":{"name":"obj_spawnEnemy3","path":"objects/obj_spawnEnemy3/obj_spawnEnemy3.yy",},}, + {"id":{"name":"obj_buttonQuit","path":"objects/obj_buttonQuit/obj_buttonQuit.yy",},}, {"id":{"name":"tileset_ground","path":"tilesets/tileset_ground/tileset_ground.yy",},}, {"id":{"name":"obj_enemy1","path":"objects/obj_enemy1/obj_enemy1.yy",},}, {"id":{"name":"spr_space","path":"sprites/spr_space/spr_space.yy",},}, + {"id":{"name":"spr_pressed","path":"sprites/spr_pressed/spr_pressed.yy",},}, {"id":{"name":"snd_bgmusic_space","path":"sounds/snd_bgmusic_space/snd_bgmusic_space.yy",},}, + {"id":{"name":"obj_buttonTutorial","path":"objects/obj_buttonTutorial/obj_buttonTutorial.yy",},}, + {"id":{"name":"spr_enemy5","path":"sprites/spr_enemy5/spr_enemy5.yy",},}, {"id":{"name":"obj_miniBossBullet","path":"objects/obj_miniBossBullet/obj_miniBossBullet.yy",},}, + {"id":{"name":"rm_credits","path":"rooms/rm_credits/rm_credits.yy",},}, {"id":{"name":"spr_miniBoss","path":"sprites/spr_miniBoss/spr_miniBoss.yy",},}, {"id":{"name":"spr_boss","path":"sprites/spr_boss/spr_boss.yy",},}, + {"id":{"name":"rm_story","path":"rooms/rm_story/rm_story.yy",},}, {"id":{"name":"spr_rock_big","path":"sprites/spr_rock_big/spr_rock_big.yy",},}, + {"id":{"name":"obj_PUmoreBullets","path":"objects/obj_PUmoreBullets/obj_PUmoreBullets.yy",},}, + {"id":{"name":"obj_credits","path":"objects/obj_credits/obj_credits.yy",},}, {"id":{"name":"spr_ground","path":"sprites/spr_ground/spr_ground.yy",},}, {"id":{"name":"obj_enemyBullet2","path":"objects/obj_enemyBullet2/obj_enemyBullet2.yy",},}, {"id":{"name":"spr_bullet","path":"sprites/spr_bullet/spr_bullet.yy",},}, + {"id":{"name":"spr_glowPlayer","path":"sprites/spr_glowPlayer/spr_glowPlayer.yy",},}, {"id":{"name":"spr_enemyBullet1","path":"sprites/spr_enemyBullet1/spr_enemyBullet1.yy",},}, {"id":{"name":"scr_spawn","path":"scripts/scr_spawn/scr_spawn.yy",},}, {"id":{"name":"obj_explosion1","path":"objects/obj_explosion1/obj_explosion1.yy",},}, {"id":{"name":"spr_sky","path":"sprites/spr_sky/spr_sky.yy",},}, {"id":{"name":"obj_enemy4","path":"objects/obj_enemy4/obj_enemy4.yy",},}, + {"id":{"name":"obj_tutorial","path":"objects/obj_tutorial/obj_tutorial.yy",},}, {"id":{"name":"spr_rock_small","path":"sprites/spr_rock_small/spr_rock_small.yy",},}, {"id":{"name":"spr_enemyBullet3","path":"sprites/spr_enemyBullet3/spr_enemyBullet3.yy",},}, {"id":{"name":"main","path":"rooms/main/main.yy",},}, ], "RoomOrderNodes": [ + {"roomId":{"name":"rm_menu","path":"rooms/rm_menu/rm_menu.yy",},}, {"roomId":{"name":"main","path":"rooms/main/main.yy",},}, - {"roomId":{"name":"rm_testing","path":"rooms/rm_testing/rm_testing.yy",},}, + {"roomId":{"name":"rm_credits","path":"rooms/rm_credits/rm_credits.yy",},}, + {"roomId":{"name":"rm_tutorial","path":"rooms/rm_tutorial/rm_tutorial.yy",},}, + {"roomId":{"name":"rm_story","path":"rooms/rm_story/rm_story.yy",},}, ], "templateType": "game", "TextureGroups": [ diff --git a/fonts/Font1/Font1.yy b/fonts/Font1/Font1.yy new file mode 100644 index 0000000..20a4e8a --- /dev/null +++ b/fonts/Font1/Font1.yy @@ -0,0 +1,44 @@ +{ + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "Font1", + "AntiAlias": 1, + "applyKerning": 0, + "ascender": 0, + "ascenderOffset": 0, + "bold": false, + "canGenerateBitmap": true, + "charset": 0, + "first": 0, + "fontName": "Arial", + "glyphOperations": 0, + "glyphs": {}, + "hinting": 0, + "includeTTF": false, + "interpreter": 0, + "italic": false, + "kerningPairs": [], + "last": 0, + "lineHeight": 0, + "maintainGms1Font": false, + "parent": { + "name": "Fonts", + "path": "folders/Fonts.yy", + }, + "pointRounding": 0, + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread": 8, + "size": 12.0, + "styleName": "Regular", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "TTFName": "", + "usesSDF": false, +} \ No newline at end of file diff --git a/fonts/fnt_menu/fnt_menu.old.png b/fonts/fnt_menu/fnt_menu.old.png new file mode 100644 index 0000000..99c2acf Binary files /dev/null and b/fonts/fnt_menu/fnt_menu.old.png differ diff --git a/fonts/fnt_menu/fnt_menu.old.yy b/fonts/fnt_menu/fnt_menu.old.yy new file mode 100644 index 0000000..72ae523 --- /dev/null +++ b/fonts/fnt_menu/fnt_menu.old.yy @@ -0,0 +1,141 @@ +{ + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "fnt_menu", + "AntiAlias": 0, + "applyKerning": 0, + "ascender": 15, + "ascenderOffset": 0, + "bold": false, + "canGenerateBitmap": true, + "charset": 0, + "first": 0, + "fontName": "Droid Sans Mono", + "glyphOperations": 0, + "glyphs": { + "32": {"character":32,"h":21,"offset":0,"shift":10,"w":10,"x":2,"y":2,}, + "33": {"character":33,"h":21,"offset":4,"shift":10,"w":2,"x":113,"y":48,}, + "34": {"character":34,"h":21,"offset":2,"shift":10,"w":5,"x":106,"y":48,}, + "35": {"character":35,"h":21,"offset":0,"shift":10,"w":9,"x":95,"y":48,}, + "36": {"character":36,"h":21,"offset":1,"shift":10,"w":7,"x":86,"y":48,}, + "37": {"character":37,"h":21,"offset":0,"shift":10,"w":10,"x":74,"y":48,}, + "38": {"character":38,"h":21,"offset":0,"shift":10,"w":10,"x":62,"y":48,}, + "39": {"character":39,"h":21,"offset":4,"shift":10,"w":2,"x":58,"y":48,}, + "40": {"character":40,"h":21,"offset":2,"shift":10,"w":5,"x":51,"y":48,}, + "41": {"character":41,"h":21,"offset":2,"shift":10,"w":5,"x":44,"y":48,}, + "42": {"character":42,"h":21,"offset":1,"shift":10,"w":8,"x":117,"y":48,}, + "43": {"character":43,"h":21,"offset":1,"shift":10,"w":7,"x":35,"y":48,}, + "44": {"character":44,"h":21,"offset":3,"shift":10,"w":3,"x":21,"y":48,}, + "45": {"character":45,"h":21,"offset":2,"shift":10,"w":5,"x":14,"y":48,}, + "46": {"character":46,"h":21,"offset":4,"shift":10,"w":2,"x":10,"y":48,}, + "47": {"character":47,"h":21,"offset":2,"shift":10,"w":6,"x":2,"y":48,}, + "48": {"character":48,"h":21,"offset":1,"shift":10,"w":7,"x":243,"y":25,}, + "49": {"character":49,"h":21,"offset":2,"shift":10,"w":4,"x":237,"y":25,}, + "50": {"character":50,"h":21,"offset":1,"shift":10,"w":7,"x":228,"y":25,}, + "51": {"character":51,"h":21,"offset":1,"shift":10,"w":7,"x":219,"y":25,}, + "52": {"character":52,"h":21,"offset":0,"shift":10,"w":9,"x":208,"y":25,}, + "53": {"character":53,"h":21,"offset":1,"shift":10,"w":7,"x":26,"y":48,}, + "54": {"character":54,"h":21,"offset":1,"shift":10,"w":7,"x":127,"y":48,}, + "55": {"character":55,"h":21,"offset":1,"shift":10,"w":7,"x":136,"y":48,}, + "56": {"character":56,"h":21,"offset":1,"shift":10,"w":7,"x":145,"y":48,}, + "57": {"character":57,"h":21,"offset":1,"shift":10,"w":7,"x":79,"y":71,}, + "58": {"character":58,"h":21,"offset":4,"shift":10,"w":2,"x":75,"y":71,}, + "59": {"character":59,"h":21,"offset":3,"shift":10,"w":3,"x":70,"y":71,}, + "60": {"character":60,"h":21,"offset":1,"shift":10,"w":7,"x":61,"y":71,}, + "61": {"character":61,"h":21,"offset":1,"shift":10,"w":7,"x":52,"y":71,}, + "62": {"character":62,"h":21,"offset":1,"shift":10,"w":7,"x":43,"y":71,}, + "63": {"character":63,"h":21,"offset":1,"shift":10,"w":7,"x":34,"y":71,}, + "64": {"character":64,"h":21,"offset":0,"shift":10,"w":9,"x":23,"y":71,}, + "65": {"character":65,"h":21,"offset":0,"shift":10,"w":9,"x":12,"y":71,}, + "66": {"character":66,"h":21,"offset":1,"shift":10,"w":8,"x":2,"y":71,}, + "67": {"character":67,"h":21,"offset":1,"shift":10,"w":8,"x":244,"y":48,}, + "68": {"character":68,"h":21,"offset":1,"shift":10,"w":8,"x":234,"y":48,}, + "69": {"character":69,"h":21,"offset":2,"shift":10,"w":6,"x":226,"y":48,}, + "70": {"character":70,"h":21,"offset":2,"shift":10,"w":6,"x":218,"y":48,}, + "71": {"character":71,"h":21,"offset":1,"shift":10,"w":8,"x":208,"y":48,}, + "72": {"character":72,"h":21,"offset":1,"shift":10,"w":8,"x":198,"y":48,}, + "73": {"character":73,"h":21,"offset":2,"shift":10,"w":6,"x":190,"y":48,}, + "74": {"character":74,"h":21,"offset":1,"shift":10,"w":7,"x":181,"y":48,}, + "75": {"character":75,"h":21,"offset":2,"shift":10,"w":7,"x":172,"y":48,}, + "76": {"character":76,"h":21,"offset":2,"shift":10,"w":6,"x":164,"y":48,}, + "77": {"character":77,"h":21,"offset":1,"shift":10,"w":8,"x":154,"y":48,}, + "78": {"character":78,"h":21,"offset":1,"shift":10,"w":8,"x":198,"y":25,}, + "79": {"character":79,"h":21,"offset":1,"shift":10,"w":8,"x":188,"y":25,}, + "80": {"character":80,"h":21,"offset":1,"shift":10,"w":8,"x":178,"y":25,}, + "81": {"character":81,"h":21,"offset":1,"shift":10,"w":8,"x":213,"y":2,}, + "82": {"character":82,"h":21,"offset":1,"shift":10,"w":8,"x":197,"y":2,}, + "83": {"character":83,"h":21,"offset":1,"shift":10,"w":8,"x":187,"y":2,}, + "84": {"character":84,"h":21,"offset":1,"shift":10,"w":8,"x":177,"y":2,}, + "85": {"character":85,"h":21,"offset":1,"shift":10,"w":8,"x":167,"y":2,}, + "86": {"character":86,"h":21,"offset":0,"shift":10,"w":9,"x":156,"y":2,}, + "87": {"character":87,"h":21,"offset":0,"shift":10,"w":10,"x":144,"y":2,}, + "88": {"character":88,"h":21,"offset":0,"shift":10,"w":9,"x":133,"y":2,}, + "89": {"character":89,"h":21,"offset":0,"shift":10,"w":9,"x":122,"y":2,}, + "90": {"character":90,"h":21,"offset":1,"shift":10,"w":8,"x":112,"y":2,}, + "91": {"character":91,"h":21,"offset":3,"shift":10,"w":4,"x":207,"y":2,}, + "92": {"character":92,"h":21,"offset":2,"shift":10,"w":6,"x":104,"y":2,}, + "93": {"character":93,"h":21,"offset":2,"shift":10,"w":4,"x":88,"y":2,}, + "94": {"character":94,"h":21,"offset":1,"shift":10,"w":8,"x":78,"y":2,}, + "95": {"character":95,"h":21,"offset":0,"shift":10,"w":10,"x":66,"y":2,}, + "96": {"character":96,"h":21,"offset":3,"shift":10,"w":3,"x":61,"y":2,}, + "97": {"character":97,"h":21,"offset":1,"shift":10,"w":7,"x":52,"y":2,}, + "98": {"character":98,"h":21,"offset":1,"shift":10,"w":8,"x":42,"y":2,}, + "99": {"character":99,"h":21,"offset":1,"shift":10,"w":7,"x":33,"y":2,}, + "100": {"character":100,"h":21,"offset":1,"shift":10,"w":7,"x":24,"y":2,}, + "101": {"character":101,"h":21,"offset":1,"shift":10,"w":8,"x":14,"y":2,}, + "102": {"character":102,"h":21,"offset":1,"shift":10,"w":8,"x":94,"y":2,}, + "103": {"character":103,"h":21,"offset":1,"shift":10,"w":8,"x":223,"y":2,}, + "104": {"character":104,"h":21,"offset":1,"shift":10,"w":7,"x":70,"y":25,}, + "105": {"character":105,"h":21,"offset":2,"shift":10,"w":6,"x":233,"y":2,}, + "106": {"character":106,"h":21,"offset":1,"shift":10,"w":6,"x":162,"y":25,}, + "107": {"character":107,"h":21,"offset":2,"shift":10,"w":7,"x":153,"y":25,}, + "108": {"character":108,"h":21,"offset":1,"shift":10,"w":7,"x":144,"y":25,}, + "109": {"character":109,"h":21,"offset":1,"shift":10,"w":8,"x":134,"y":25,}, + "110": {"character":110,"h":21,"offset":1,"shift":10,"w":7,"x":125,"y":25,}, + "111": {"character":111,"h":21,"offset":1,"shift":10,"w":8,"x":115,"y":25,}, + "112": {"character":112,"h":21,"offset":1,"shift":10,"w":8,"x":105,"y":25,}, + "113": {"character":113,"h":21,"offset":1,"shift":10,"w":7,"x":96,"y":25,}, + "114": {"character":114,"h":21,"offset":2,"shift":10,"w":6,"x":88,"y":25,}, + "115": {"character":115,"h":21,"offset":2,"shift":10,"w":6,"x":170,"y":25,}, + "116": {"character":116,"h":21,"offset":1,"shift":10,"w":7,"x":79,"y":25,}, + "117": {"character":117,"h":21,"offset":1,"shift":10,"w":7,"x":61,"y":25,}, + "118": {"character":118,"h":21,"offset":1,"shift":10,"w":8,"x":51,"y":25,}, + "119": {"character":119,"h":21,"offset":0,"shift":10,"w":10,"x":39,"y":25,}, + "120": {"character":120,"h":21,"offset":1,"shift":10,"w":8,"x":29,"y":25,}, + "121": {"character":121,"h":21,"offset":1,"shift":10,"w":8,"x":19,"y":25,}, + "122": {"character":122,"h":21,"offset":1,"shift":10,"w":7,"x":10,"y":25,}, + "123": {"character":123,"h":21,"offset":2,"shift":10,"w":6,"x":2,"y":25,}, + "124": {"character":124,"h":21,"offset":4,"shift":10,"w":1,"x":249,"y":2,}, + "125": {"character":125,"h":21,"offset":2,"shift":10,"w":6,"x":241,"y":2,}, + "126": {"character":126,"h":21,"offset":1,"shift":10,"w":7,"x":88,"y":71,}, + "9647": {"character":9647,"h":21,"offset":3,"shift":16,"w":9,"x":97,"y":71,}, + }, + "hinting": 0, + "includeTTF": false, + "interpreter": 0, + "italic": false, + "kerningPairs": [], + "last": 0, + "lineHeight": 21, + "maintainGms1Font": false, + "parent": { + "name": "Fonts", + "path": "folders/Fonts.yy", + }, + "pointRounding": 0, + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread": 8, + "size": 12.0, + "styleName": "Regular", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "TTFName": "", + "usesSDF": false, +} \ No newline at end of file diff --git a/fonts/fnt_menu/fnt_menu.png b/fonts/fnt_menu/fnt_menu.png new file mode 100644 index 0000000..92bc730 Binary files /dev/null and b/fonts/fnt_menu/fnt_menu.png differ diff --git a/fonts/fnt_menu/fnt_menu.yy b/fonts/fnt_menu/fnt_menu.yy new file mode 100644 index 0000000..f7edda6 --- /dev/null +++ b/fonts/fnt_menu/fnt_menu.yy @@ -0,0 +1,141 @@ +{ + "resourceType": "GMFont", + "resourceVersion": "1.0", + "name": "fnt_menu", + "AntiAlias": 1, + "applyKerning": 0, + "ascender": 15, + "ascenderOffset": 0, + "bold": false, + "canGenerateBitmap": true, + "charset": 0, + "first": 0, + "fontName": "Droid Sans Mono", + "glyphOperations": 0, + "glyphs": { + "32": {"character":32,"h":21,"offset":0,"shift":10,"w":10,"x":2,"y":2,}, + "33": {"character":33,"h":21,"offset":3,"shift":10,"w":3,"x":173,"y":48,}, + "34": {"character":34,"h":21,"offset":2,"shift":10,"w":6,"x":165,"y":48,}, + "35": {"character":35,"h":21,"offset":0,"shift":10,"w":10,"x":153,"y":48,}, + "36": {"character":36,"h":21,"offset":1,"shift":10,"w":8,"x":143,"y":48,}, + "37": {"character":37,"h":21,"offset":0,"shift":10,"w":10,"x":131,"y":48,}, + "38": {"character":38,"h":21,"offset":0,"shift":10,"w":10,"x":119,"y":48,}, + "39": {"character":39,"h":21,"offset":3,"shift":10,"w":3,"x":114,"y":48,}, + "40": {"character":40,"h":21,"offset":2,"shift":10,"w":6,"x":106,"y":48,}, + "41": {"character":41,"h":21,"offset":2,"shift":10,"w":6,"x":98,"y":48,}, + "42": {"character":42,"h":21,"offset":1,"shift":10,"w":8,"x":178,"y":48,}, + "43": {"character":43,"h":21,"offset":1,"shift":10,"w":8,"x":88,"y":48,}, + "44": {"character":44,"h":21,"offset":3,"shift":10,"w":4,"x":72,"y":48,}, + "45": {"character":45,"h":21,"offset":2,"shift":10,"w":6,"x":64,"y":48,}, + "46": {"character":46,"h":21,"offset":3,"shift":10,"w":3,"x":59,"y":48,}, + "47": {"character":47,"h":21,"offset":1,"shift":10,"w":7,"x":50,"y":48,}, + "48": {"character":48,"h":21,"offset":1,"shift":10,"w":8,"x":40,"y":48,}, + "49": {"character":49,"h":21,"offset":1,"shift":10,"w":5,"x":33,"y":48,}, + "50": {"character":50,"h":21,"offset":1,"shift":10,"w":8,"x":23,"y":48,}, + "51": {"character":51,"h":21,"offset":1,"shift":10,"w":8,"x":13,"y":48,}, + "52": {"character":52,"h":21,"offset":0,"shift":10,"w":9,"x":2,"y":48,}, + "53": {"character":53,"h":21,"offset":1,"shift":10,"w":8,"x":78,"y":48,}, + "54": {"character":54,"h":21,"offset":1,"shift":10,"w":8,"x":188,"y":48,}, + "55": {"character":55,"h":21,"offset":1,"shift":10,"w":8,"x":198,"y":48,}, + "56": {"character":56,"h":21,"offset":1,"shift":10,"w":8,"x":208,"y":48,}, + "57": {"character":57,"h":21,"offset":1,"shift":10,"w":8,"x":166,"y":71,}, + "58": {"character":58,"h":21,"offset":3,"shift":10,"w":3,"x":161,"y":71,}, + "59": {"character":59,"h":21,"offset":3,"shift":10,"w":3,"x":156,"y":71,}, + "60": {"character":60,"h":21,"offset":1,"shift":10,"w":8,"x":146,"y":71,}, + "61": {"character":61,"h":21,"offset":1,"shift":10,"w":8,"x":136,"y":71,}, + "62": {"character":62,"h":21,"offset":1,"shift":10,"w":8,"x":126,"y":71,}, + "63": {"character":63,"h":21,"offset":1,"shift":10,"w":8,"x":116,"y":71,}, + "64": {"character":64,"h":21,"offset":0,"shift":10,"w":10,"x":104,"y":71,}, + "65": {"character":65,"h":21,"offset":0,"shift":10,"w":10,"x":92,"y":71,}, + "66": {"character":66,"h":21,"offset":1,"shift":10,"w":8,"x":82,"y":71,}, + "67": {"character":67,"h":21,"offset":1,"shift":10,"w":9,"x":71,"y":71,}, + "68": {"character":68,"h":21,"offset":1,"shift":10,"w":8,"x":61,"y":71,}, + "69": {"character":69,"h":21,"offset":1,"shift":10,"w":8,"x":51,"y":71,}, + "70": {"character":70,"h":21,"offset":1,"shift":10,"w":8,"x":41,"y":71,}, + "71": {"character":71,"h":21,"offset":0,"shift":10,"w":9,"x":30,"y":71,}, + "72": {"character":72,"h":21,"offset":1,"shift":10,"w":8,"x":20,"y":71,}, + "73": {"character":73,"h":21,"offset":1,"shift":10,"w":7,"x":11,"y":71,}, + "74": {"character":74,"h":21,"offset":1,"shift":10,"w":7,"x":2,"y":71,}, + "75": {"character":75,"h":21,"offset":1,"shift":10,"w":9,"x":239,"y":48,}, + "76": {"character":76,"h":21,"offset":1,"shift":10,"w":8,"x":229,"y":48,}, + "77": {"character":77,"h":21,"offset":0,"shift":10,"w":9,"x":218,"y":48,}, + "78": {"character":78,"h":21,"offset":1,"shift":10,"w":8,"x":241,"y":25,}, + "79": {"character":79,"h":21,"offset":0,"shift":10,"w":9,"x":230,"y":25,}, + "80": {"character":80,"h":21,"offset":1,"shift":10,"w":8,"x":220,"y":25,}, + "81": {"character":81,"h":21,"offset":0,"shift":10,"w":9,"x":229,"y":2,}, + "82": {"character":82,"h":21,"offset":1,"shift":10,"w":9,"x":211,"y":2,}, + "83": {"character":83,"h":21,"offset":1,"shift":10,"w":8,"x":201,"y":2,}, + "84": {"character":84,"h":21,"offset":0,"shift":10,"w":9,"x":190,"y":2,}, + "85": {"character":85,"h":21,"offset":0,"shift":10,"w":9,"x":179,"y":2,}, + "86": {"character":86,"h":21,"offset":0,"shift":10,"w":10,"x":167,"y":2,}, + "87": {"character":87,"h":21,"offset":0,"shift":10,"w":10,"x":155,"y":2,}, + "88": {"character":88,"h":21,"offset":0,"shift":10,"w":10,"x":143,"y":2,}, + "89": {"character":89,"h":21,"offset":0,"shift":10,"w":10,"x":131,"y":2,}, + "90": {"character":90,"h":21,"offset":0,"shift":10,"w":9,"x":120,"y":2,}, + "91": {"character":91,"h":21,"offset":3,"shift":10,"w":5,"x":222,"y":2,}, + "92": {"character":92,"h":21,"offset":1,"shift":10,"w":7,"x":111,"y":2,}, + "93": {"character":93,"h":21,"offset":2,"shift":10,"w":5,"x":94,"y":2,}, + "94": {"character":94,"h":21,"offset":0,"shift":10,"w":9,"x":83,"y":2,}, + "95": {"character":95,"h":21,"offset":-1,"shift":10,"w":11,"x":70,"y":2,}, + "96": {"character":96,"h":21,"offset":3,"shift":10,"w":4,"x":64,"y":2,}, + "97": {"character":97,"h":21,"offset":1,"shift":10,"w":8,"x":54,"y":2,}, + "98": {"character":98,"h":21,"offset":1,"shift":10,"w":8,"x":44,"y":2,}, + "99": {"character":99,"h":21,"offset":1,"shift":10,"w":8,"x":34,"y":2,}, + "100": {"character":100,"h":21,"offset":1,"shift":10,"w":8,"x":24,"y":2,}, + "101": {"character":101,"h":21,"offset":1,"shift":10,"w":8,"x":14,"y":2,}, + "102": {"character":102,"h":21,"offset":1,"shift":10,"w":8,"x":101,"y":2,}, + "103": {"character":103,"h":21,"offset":0,"shift":10,"w":9,"x":240,"y":2,}, + "104": {"character":104,"h":21,"offset":1,"shift":10,"w":8,"x":100,"y":25,}, + "105": {"character":105,"h":21,"offset":1,"shift":10,"w":8,"x":2,"y":25,}, + "106": {"character":106,"h":21,"offset":1,"shift":10,"w":6,"x":202,"y":25,}, + "107": {"character":107,"h":21,"offset":1,"shift":10,"w":9,"x":191,"y":25,}, + "108": {"character":108,"h":21,"offset":1,"shift":10,"w":8,"x":181,"y":25,}, + "109": {"character":109,"h":21,"offset":0,"shift":10,"w":9,"x":170,"y":25,}, + "110": {"character":110,"h":21,"offset":1,"shift":10,"w":8,"x":160,"y":25,}, + "111": {"character":111,"h":21,"offset":0,"shift":10,"w":9,"x":149,"y":25,}, + "112": {"character":112,"h":21,"offset":1,"shift":10,"w":8,"x":139,"y":25,}, + "113": {"character":113,"h":21,"offset":1,"shift":10,"w":8,"x":129,"y":25,}, + "114": {"character":114,"h":21,"offset":2,"shift":10,"w":7,"x":120,"y":25,}, + "115": {"character":115,"h":21,"offset":1,"shift":10,"w":8,"x":210,"y":25,}, + "116": {"character":116,"h":21,"offset":1,"shift":10,"w":8,"x":110,"y":25,}, + "117": {"character":117,"h":21,"offset":1,"shift":10,"w":8,"x":90,"y":25,}, + "118": {"character":118,"h":21,"offset":0,"shift":10,"w":9,"x":79,"y":25,}, + "119": {"character":119,"h":21,"offset":-1,"shift":10,"w":11,"x":66,"y":25,}, + "120": {"character":120,"h":21,"offset":0,"shift":10,"w":9,"x":55,"y":25,}, + "121": {"character":121,"h":21,"offset":0,"shift":10,"w":9,"x":44,"y":25,}, + "122": {"character":122,"h":21,"offset":1,"shift":10,"w":8,"x":34,"y":25,}, + "123": {"character":123,"h":21,"offset":1,"shift":10,"w":7,"x":25,"y":25,}, + "124": {"character":124,"h":21,"offset":4,"shift":10,"w":2,"x":21,"y":25,}, + "125": {"character":125,"h":21,"offset":1,"shift":10,"w":7,"x":12,"y":25,}, + "126": {"character":126,"h":21,"offset":1,"shift":10,"w":8,"x":176,"y":71,}, + "9647": {"character":9647,"h":21,"offset":3,"shift":16,"w":10,"x":186,"y":71,}, + }, + "hinting": 0, + "includeTTF": false, + "interpreter": 0, + "italic": false, + "kerningPairs": [], + "last": 0, + "lineHeight": 21, + "maintainGms1Font": false, + "parent": { + "name": "Fonts", + "path": "folders/Fonts.yy", + }, + "pointRounding": 0, + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "sampleText": "abcdef ABCDEF\n0123456789 .,<>\"'&!?\nthe quick brown fox jumps over the lazy dog\nTHE QUICK BROWN FOX JUMPS OVER THE LAZY DOG\nDefault character: ▯ (9647)", + "sdfSpread": 8, + "size": 12.0, + "styleName": "Regular", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "TTFName": "", + "usesSDF": false, +} \ No newline at end of file diff --git a/objects/Object21/Object21.yy b/objects/Object21/Object21.yy new file mode 100644 index 0000000..d84fa2b --- /dev/null +++ b/objects/Object21/Object21.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "Object21", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/Object22/Object22.yy b/objects/Object22/Object22.yy new file mode 100644 index 0000000..4e913a7 --- /dev/null +++ b/objects/Object22/Object22.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "Object22", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/Object23/Object23.yy b/objects/Object23/Object23.yy new file mode 100644 index 0000000..6fab6fd --- /dev/null +++ b/objects/Object23/Object23.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "Object23", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/Object24/Object24.yy b/objects/Object24/Object24.yy new file mode 100644 index 0000000..7905e2f --- /dev/null +++ b/objects/Object24/Object24.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "Object24", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/Object25/Object25.yy b/objects/Object25/Object25.yy new file mode 100644 index 0000000..985a324 --- /dev/null +++ b/objects/Object25/Object25.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "Object25", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/Object26/Object26.yy b/objects/Object26/Object26.yy new file mode 100644 index 0000000..44a141e --- /dev/null +++ b/objects/Object26/Object26.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "Object26", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_PUhealth/obj_PUhealth.yy b/objects/obj_PUhealth/obj_PUhealth.yy new file mode 100644 index 0000000..1347779 --- /dev/null +++ b/objects/obj_PUhealth/obj_PUhealth.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_PUhealth", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_PUmoreBullets/obj_PUmoreBullets.yy b/objects/obj_PUmoreBullets/obj_PUmoreBullets.yy new file mode 100644 index 0000000..fc5bfbf --- /dev/null +++ b/objects/obj_PUmoreBullets/obj_PUmoreBullets.yy @@ -0,0 +1,34 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_PUmoreBullets", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_healthPowerUp", + "path": "sprites/spr_healthPowerUp/spr_healthPowerUp.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_boss/Alarm_2.gml b/objects/obj_boss/Alarm_2.gml index 71f45dc..c46d280 100644 --- a/objects/obj_boss/Alarm_2.gml +++ b/objects/obj_boss/Alarm_2.gml @@ -1,10 +1,14 @@ /// @description Insert description here // You can write your code in this editor -obj_enemy2.movementSpeed = 6 +if (instance_exists(obj_enemy2)) { + obj_enemy2.movementSpeed = 6 +} obj_player.movementSpeed = 6 movementSpeed = 7 obj_player.shotSpeed = 5 shotSpeed = 5 obj_miniBossBullet.bulletSpeed = 2 -obj_playerBullet1.bulletSpeed = 10 +if (instance_exists(obj_playerBullet1)) { + obj_playerBullet1.bulletSpeed = 10 +} alarm[3] = irandom_range(300, 600) diff --git a/objects/obj_boss/Destroy_0.gml b/objects/obj_boss/Destroy_0.gml new file mode 100644 index 0000000..90b721d --- /dev/null +++ b/objects/obj_boss/Destroy_0.gml @@ -0,0 +1,8 @@ +/// @description Insert description here +// You can write your code in this editor +obj_game.allowMovement = false +instance_destroy(obj_spawnEnemy2) +instance_destroy(obj_enemy2) +obj_game.bossDead = true +obj_game.doTimer = false + diff --git a/objects/obj_boss/Step_0.gml b/objects/obj_boss/Step_0.gml index 8abd4d4..3ee4e90 100644 --- a/objects/obj_boss/Step_0.gml +++ b/objects/obj_boss/Step_0.gml @@ -36,10 +36,12 @@ if (obj_player.states = States.regular) and (obj_game.dying = false) { } obj_player.movementSpeed = 3 obj_player.shotSpeed = 10 - movementSpeed = 3 - shotSpeed = 10 + // movementSpeed = 3 removed + shotSpeed = 20 // changed from 10 to 20 + if (instance_exists(obj_playerBullet1)) { + obj_playerBullet1.bulletSpeed = 5 + } // hotfix obj_miniBossBullet.bulletSpeed = 1 - obj_playerBullet1.bulletSpeed = 5 alarm[2] = 300 slowTime = false } @@ -47,6 +49,6 @@ if (obj_player.states = States.regular) and (obj_game.dying = false) { if (bossHealth <= 0) { obj_game.bossHealthBar = false; instance_destroy() - obj_game.timer = 150 + //obj_game.timer = 150 } diff --git a/objects/obj_boss/obj_boss.yy b/objects/obj_boss/obj_boss.yy index 435c878..c74405d 100644 --- a/objects/obj_boss/obj_boss.yy +++ b/objects/obj_boss/obj_boss.yy @@ -7,6 +7,7 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":2,"eventType":2,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":3,"eventType":2,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], @@ -36,8 +37,8 @@ ], "solid": false, "spriteId": { - "name": "spr_miniBoss", - "path": "sprites/spr_miniBoss/spr_miniBoss.yy", + "name": "spr_boss", + "path": "sprites/spr_boss/spr_boss.yy", }, "spriteMaskId": null, "visible": true, diff --git a/objects/obj_button/obj_button.yy b/objects/obj_button/obj_button.yy new file mode 100644 index 0000000..fe08664 --- /dev/null +++ b/objects/obj_button/obj_button.yy @@ -0,0 +1,31 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_button", + "eventList": [], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "Objects", + "path": "folders/Objects.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonCredits/Mouse_4.gml b/objects/obj_buttonCredits/Mouse_4.gml new file mode 100644 index 0000000..7247726 --- /dev/null +++ b/objects/obj_buttonCredits/Mouse_4.gml @@ -0,0 +1,4 @@ +event_inherited(); + +room_goto(rm_credits); + diff --git a/objects/obj_buttonCredits/obj_buttonCredits.yy b/objects/obj_buttonCredits/obj_buttonCredits.yy new file mode 100644 index 0000000..d16e949 --- /dev/null +++ b/objects/obj_buttonCredits/obj_buttonCredits.yy @@ -0,0 +1,41 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonCredits", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"propertyId":{"name":"button_text","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"value":"Credits",}, + ], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": { + "name": "obj_buttonParent", + "path": "objects/obj_buttonParent/obj_buttonParent.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_button", + "path": "sprites/spr_button/spr_button.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonMenu/Mouse_4.gml b/objects/obj_buttonMenu/Mouse_4.gml new file mode 100644 index 0000000..3641192 --- /dev/null +++ b/objects/obj_buttonMenu/Mouse_4.gml @@ -0,0 +1,4 @@ +event_inherited(); + +room_goto(rm_menu); + diff --git a/objects/obj_buttonMenu/obj_buttonMenu.yy b/objects/obj_buttonMenu/obj_buttonMenu.yy new file mode 100644 index 0000000..ee941de --- /dev/null +++ b/objects/obj_buttonMenu/obj_buttonMenu.yy @@ -0,0 +1,41 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonMenu", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"propertyId":{"name":"button_text","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"value":"Back to Menu",}, + ], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": { + "name": "obj_buttonParent", + "path": "objects/obj_buttonParent/obj_buttonParent.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_button", + "path": "sprites/spr_button/spr_button.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonParent/Draw_0.gml b/objects/obj_buttonParent/Draw_0.gml new file mode 100644 index 0000000..901cd72 --- /dev/null +++ b/objects/obj_buttonParent/Draw_0.gml @@ -0,0 +1,11 @@ +draw_self(); + +draw_set_font(fnt_menu); + +draw_set_halign(fa_center); +draw_set_valign(fa_middle); + +draw_text(x,y, button_text); + +draw_set_halign(fa_left); +draw_set_valign(fa_top); \ No newline at end of file diff --git a/objects/obj_buttonParent/Mouse_10.gml b/objects/obj_buttonParent/Mouse_10.gml new file mode 100644 index 0000000..4d298c9 --- /dev/null +++ b/objects/obj_buttonParent/Mouse_10.gml @@ -0,0 +1 @@ +sprite_index = spr_pressed; \ No newline at end of file diff --git a/objects/obj_buttonParent/Mouse_11.gml b/objects/obj_buttonParent/Mouse_11.gml new file mode 100644 index 0000000..c0bfd2d --- /dev/null +++ b/objects/obj_buttonParent/Mouse_11.gml @@ -0,0 +1 @@ +sprite_index = spr_button; \ No newline at end of file diff --git a/objects/obj_buttonParent/Mouse_4.gml b/objects/obj_buttonParent/Mouse_4.gml new file mode 100644 index 0000000..e69de29 diff --git a/objects/obj_buttonParent/obj_buttonParent.yy b/objects/obj_buttonParent/obj_buttonParent.yy new file mode 100644 index 0000000..2543f52 --- /dev/null +++ b/objects/obj_buttonParent/obj_buttonParent.yy @@ -0,0 +1,38 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonParent", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":10,"eventType":6,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":11,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [ + {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"button_text","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"","varType":2,}, + ], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonPlay/Mouse_4.gml b/objects/obj_buttonPlay/Mouse_4.gml new file mode 100644 index 0000000..9a7c252 --- /dev/null +++ b/objects/obj_buttonPlay/Mouse_4.gml @@ -0,0 +1,7 @@ +/// @description Play the game + +// Inherit the parent event +event_inherited(); + +room_goto(main); + diff --git a/objects/obj_buttonPlay/obj_buttonPlay.yy b/objects/obj_buttonPlay/obj_buttonPlay.yy new file mode 100644 index 0000000..2739cb2 --- /dev/null +++ b/objects/obj_buttonPlay/obj_buttonPlay.yy @@ -0,0 +1,41 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonPlay", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"propertyId":{"name":"button_text","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"value":"Play",}, + ], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": { + "name": "obj_buttonParent", + "path": "objects/obj_buttonParent/obj_buttonParent.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_button", + "path": "sprites/spr_button/spr_button.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonQuit/Mouse_4.gml b/objects/obj_buttonQuit/Mouse_4.gml new file mode 100644 index 0000000..8b58902 --- /dev/null +++ b/objects/obj_buttonQuit/Mouse_4.gml @@ -0,0 +1,4 @@ +/// @description Exit the game +event_inherited(); + +game_end(); diff --git a/objects/obj_buttonQuit/obj_buttonQuit.yy b/objects/obj_buttonQuit/obj_buttonQuit.yy new file mode 100644 index 0000000..b50d120 --- /dev/null +++ b/objects/obj_buttonQuit/obj_buttonQuit.yy @@ -0,0 +1,41 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonQuit", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"propertyId":{"name":"button_text","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"value":"Quit",}, + ], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": { + "name": "obj_buttonParent", + "path": "objects/obj_buttonParent/obj_buttonParent.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_button", + "path": "sprites/spr_button/spr_button.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonStory/Mouse_4.gml b/objects/obj_buttonStory/Mouse_4.gml new file mode 100644 index 0000000..9170372 --- /dev/null +++ b/objects/obj_buttonStory/Mouse_4.gml @@ -0,0 +1,3 @@ +event_inherited(); + +room_goto(rm_story); diff --git a/objects/obj_buttonStory/obj_buttonStory.yy b/objects/obj_buttonStory/obj_buttonStory.yy new file mode 100644 index 0000000..48f008e --- /dev/null +++ b/objects/obj_buttonStory/obj_buttonStory.yy @@ -0,0 +1,41 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonStory", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"propertyId":{"name":"button_text","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"value":"Story",}, + ], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": { + "name": "obj_buttonParent", + "path": "objects/obj_buttonParent/obj_buttonParent.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_button", + "path": "sprites/spr_button/spr_button.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_buttonTutorial/Mouse_4.gml b/objects/obj_buttonTutorial/Mouse_4.gml new file mode 100644 index 0000000..62b13d3 --- /dev/null +++ b/objects/obj_buttonTutorial/Mouse_4.gml @@ -0,0 +1,3 @@ +event_inherited(); + +room_goto(rm_tutorial); diff --git a/objects/obj_buttonTutorial/obj_buttonTutorial.yy b/objects/obj_buttonTutorial/obj_buttonTutorial.yy new file mode 100644 index 0000000..ce013f0 --- /dev/null +++ b/objects/obj_buttonTutorial/obj_buttonTutorial.yy @@ -0,0 +1,41 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_buttonTutorial", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":6,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [ + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_buttonParent","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"propertyId":{"name":"button_text","path":"objects/obj_buttonParent/obj_buttonParent.yy",},"value":"Tutorial",}, + ], + "parent": { + "name": "obj_buttons", + "path": "folders/Objects/obj_buttons.yy", + }, + "parentObjectId": { + "name": "obj_buttonParent", + "path": "objects/obj_buttonParent/obj_buttonParent.yy", + }, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": { + "name": "spr_button", + "path": "sprites/spr_button/spr_button.yy", + }, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_credits/Draw_0.gml b/objects/obj_credits/Draw_0.gml new file mode 100644 index 0000000..69df0b3 --- /dev/null +++ b/objects/obj_credits/Draw_0.gml @@ -0,0 +1,22 @@ +/// @description Insert description here +// You can write your code in this editor + +draw_set_color(c_black); +draw_set_halign(fa_left); +draw_set_valign(fa_top); + + +draw_text(50, 50, "Team A"); +draw_text(50, 100, "Programmer: Kabir Narayan"); +draw_text(50, 130, "Producer: Walter Nguyen"); +draw_text(50, 160, "Designer: David Taylor"); +draw_text(50, 190, "Artist: Josh Diggs"); +draw_text(100, 240, "Licenses"); +draw_text(50, 290, "Art:"); +draw_text(50, 340, "Most sprites by Josh Diggs"); +draw_text(50, 370, "Enemy 4 and 5 by Walter Nguyen"); +draw_text(50, 400,"glow Circle (spr_glowPlayer) by oglsdl licensed"); +draw_text(50, 430, "CCO: https://opengameart.org/content/glow-circle"); +draw_text(50, 460, "Blank Button (spr_button) by krial licensed CCO:"); +draw_text(50, 490, "https://opengameart.org/content/blank-button"); +draw_text(100, 540, "Music and sound effects:"); diff --git a/objects/obj_credits/obj_credits.yy b/objects/obj_credits/obj_credits.yy new file mode 100644 index 0000000..e695722 --- /dev/null +++ b/objects/obj_credits/obj_credits.yy @@ -0,0 +1,33 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_credits", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "obj_text", + "path": "folders/Objects/obj_text.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_enemy2/Collision_obj_player.gml b/objects/obj_enemy1/Collision_obj_player.gml similarity index 100% rename from objects/obj_enemy2/Collision_obj_player.gml rename to objects/obj_enemy1/Collision_obj_player.gml diff --git a/objects/obj_enemy1/Step_0.gml b/objects/obj_enemy1/Step_0.gml index 8381d8d..9b6743a 100644 --- a/objects/obj_enemy1/Step_0.gml +++ b/objects/obj_enemy1/Step_0.gml @@ -2,13 +2,11 @@ // You can write your code in this editor if (obj_player.states = States.regular) { y += movementSpeed - -scr_spawn() - + scr_spawn() if (canShoot = true) { instance_create_layer(x, y,"Instances", obj_enemyBullet1) canShoot = false - alarm[0] = 60 + alarm[0] = 80 // slowed fire rate from 60 to 80 } } diff --git a/objects/obj_enemy1/obj_enemy1.yy b/objects/obj_enemy1/obj_enemy1.yy index 28a85f5..550fcc3 100644 --- a/objects/obj_enemy1/obj_enemy1.yy +++ b/objects/obj_enemy1/obj_enemy1.yy @@ -6,12 +6,13 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"eventNum":0,"eventType":4,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "name": "obj_enemy", + "path": "folders/Objects/obj_enemy.yy", }, "parentObjectId": null, "persistent": false, @@ -29,6 +30,7 @@ "physicsStartAwake": true, "properties": [ {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"movementSpeed","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"4","varType":1,}, + {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"enemy_score","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"1000","varType":1,}, ], "solid": false, "spriteId": { diff --git a/objects/obj_enemy2/obj_enemy2.yy b/objects/obj_enemy2/obj_enemy2.yy index 94cf8a1..f72df83 100644 --- a/objects/obj_enemy2/obj_enemy2.yy +++ b/objects/obj_enemy2/obj_enemy2.yy @@ -5,15 +5,14 @@ "eventList": [ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":0,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"eventNum":0,"eventType":4,"isDnD":false,}, ], "managed": true, "overriddenProperties": [ - {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_enemy1","path":"objects/obj_enemy1/obj_enemy1.yy",},"propertyId":{"name":"movementSpeed","path":"objects/obj_enemy1/obj_enemy1.yy",},"value":"6",}, + {"resourceType":"GMOverriddenProperty","resourceVersion":"1.0","name":"","objectId":{"name":"obj_enemy1","path":"objects/obj_enemy1/obj_enemy1.yy",},"propertyId":{"name":"movementSpeed","path":"objects/obj_enemy1/obj_enemy1.yy",},"value":"8",}, ], "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "name": "obj_enemy", + "path": "folders/Objects/obj_enemy.yy", }, "parentObjectId": { "name": "obj_enemy1", diff --git a/objects/obj_enemy3/Step_0.gml b/objects/obj_enemy3/Step_0.gml index fa8af21..7819c33 100644 --- a/objects/obj_enemy3/Step_0.gml +++ b/objects/obj_enemy3/Step_0.gml @@ -8,7 +8,7 @@ scr_spawn() if (canShoot = true) { instance_create_layer(x, y,"Instances", obj_enemyBullet2) canShoot = false - pointingdirection += 30; + pointingdirection += 100; alarm[0] = 10 } diff --git a/objects/obj_enemy3/obj_enemy3.yy b/objects/obj_enemy3/obj_enemy3.yy index a8e2ed8..87358f8 100644 --- a/objects/obj_enemy3/obj_enemy3.yy +++ b/objects/obj_enemy3/obj_enemy3.yy @@ -10,8 +10,8 @@ "managed": true, "overriddenProperties": [], "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "name": "obj_enemy", + "path": "folders/Objects/obj_enemy.yy", }, "parentObjectId": { "name": "obj_enemy1", diff --git a/objects/obj_enemy4/Step_0-TI84CalculatorSupreme.gml b/objects/obj_enemy4/Step_0-TI84CalculatorSupreme.gml new file mode 100644 index 0000000..fec145c --- /dev/null +++ b/objects/obj_enemy4/Step_0-TI84CalculatorSupreme.gml @@ -0,0 +1,12 @@ +/// @description Insert description here +// You can write your code in this editor + +if (obj_player.states = States.regular) { + y += movementSpeed + scr_spawn() + if (canShoot = true) { + instance_create_layer(x, y,"Instances", obj_enemyBullet1) + canShoot = false + alarm[0] = 80 // slowed fire rate from 60 to 80 + } +} \ No newline at end of file diff --git a/objects/obj_enemy4/Step_0.gml b/objects/obj_enemy4/Step_0.gml new file mode 100644 index 0000000..fec145c --- /dev/null +++ b/objects/obj_enemy4/Step_0.gml @@ -0,0 +1,12 @@ +/// @description Insert description here +// You can write your code in this editor + +if (obj_player.states = States.regular) { + y += movementSpeed + scr_spawn() + if (canShoot = true) { + instance_create_layer(x, y,"Instances", obj_enemyBullet1) + canShoot = false + alarm[0] = 80 // slowed fire rate from 60 to 80 + } +} \ No newline at end of file diff --git a/objects/obj_enemy4/obj_enemy4.yy b/objects/obj_enemy4/obj_enemy4.yy index 0f7b212..3a987e8 100644 --- a/objects/obj_enemy4/obj_enemy4.yy +++ b/objects/obj_enemy4/obj_enemy4.yy @@ -2,14 +2,19 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_enemy4", - "eventList": [], + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], "managed": true, "overriddenProperties": [], "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "name": "obj_enemy", + "path": "folders/Objects/obj_enemy.yy", + }, + "parentObjectId": { + "name": "obj_enemy1", + "path": "objects/obj_enemy1/obj_enemy1.yy", }, - "parentObjectId": null, "persistent": false, "physicsAngularDamping": 0.1, "physicsDensity": 0.5, @@ -25,7 +30,10 @@ "physicsStartAwake": true, "properties": [], "solid": false, - "spriteId": null, + "spriteId": { + "name": "spr_enemy4", + "path": "sprites/spr_enemy4/spr_enemy4.yy", + }, "spriteMaskId": null, "visible": true, } \ No newline at end of file diff --git a/objects/obj_enemyBullet1/Collision_obj_player.gml b/objects/obj_enemy5/Step_0-TI84CalculatorSupreme.gml similarity index 55% rename from objects/obj_enemyBullet1/Collision_obj_player.gml rename to objects/obj_enemy5/Step_0-TI84CalculatorSupreme.gml index 139baf2..9ef58d6 100644 --- a/objects/obj_enemyBullet1/Collision_obj_player.gml +++ b/objects/obj_enemy5/Step_0-TI84CalculatorSupreme.gml @@ -1,6 +1,6 @@ /// @description Insert description here // You can write your code in this editor -if (obj_game.dying = false) { - health -= 1; - instance_destroy(); -} \ No newline at end of file +// Inherit the parent event +event_inherited(); + + diff --git a/objects/obj_enemy5/Step_0.gml b/objects/obj_enemy5/Step_0.gml new file mode 100644 index 0000000..9ef58d6 --- /dev/null +++ b/objects/obj_enemy5/Step_0.gml @@ -0,0 +1,6 @@ +/// @description Insert description here +// You can write your code in this editor +// Inherit the parent event +event_inherited(); + + diff --git a/objects/obj_enemy5/obj_enemy5.yy b/objects/obj_enemy5/obj_enemy5.yy index f996f6a..85a62b6 100644 --- a/objects/obj_enemy5/obj_enemy5.yy +++ b/objects/obj_enemy5/obj_enemy5.yy @@ -2,14 +2,19 @@ "resourceType": "GMObject", "resourceVersion": "1.0", "name": "obj_enemy5", - "eventList": [], + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, + ], "managed": true, "overriddenProperties": [], "parent": { - "name": "Objects", - "path": "folders/Objects.yy", + "name": "obj_enemy", + "path": "folders/Objects/obj_enemy.yy", + }, + "parentObjectId": { + "name": "obj_enemy1", + "path": "objects/obj_enemy1/obj_enemy1.yy", }, - "parentObjectId": null, "persistent": false, "physicsAngularDamping": 0.1, "physicsDensity": 0.5, @@ -25,7 +30,10 @@ "physicsStartAwake": true, "properties": [], "solid": false, - "spriteId": null, + "spriteId": { + "name": "spr_enemy5", + "path": "sprites/spr_enemy5/spr_enemy5.yy", + }, "spriteMaskId": null, "visible": true, } \ No newline at end of file diff --git a/objects/obj_enemyBullet1/obj_enemyBullet1.yy b/objects/obj_enemyBullet1/obj_enemyBullet1.yy index 0a74031..751aa9c 100644 --- a/objects/obj_enemyBullet1/obj_enemyBullet1.yy +++ b/objects/obj_enemyBullet1/obj_enemyBullet1.yy @@ -4,7 +4,6 @@ "name": "obj_enemyBullet1", "eventList": [ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":3,"isDnD":false,}, - {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":{"name":"obj_player","path":"objects/obj_player/obj_player.yy",},"eventNum":0,"eventType":4,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/obj_game/Alarm_1.gml b/objects/obj_game/Alarm_1.gml index e1e63d8..3b1d962 100644 --- a/objects/obj_game/Alarm_1.gml +++ b/objects/obj_game/Alarm_1.gml @@ -1,6 +1,6 @@ /// @description Insert description here // You can write your code in this editor -health = 15; +health = 8; obj_player.states = States.regular; obj_player.x = room_width/2 obj_player.y -= 4 diff --git a/objects/obj_game/Alarm_7.gml b/objects/obj_game/Alarm_7.gml new file mode 100644 index 0000000..63d8681 --- /dev/null +++ b/objects/obj_game/Alarm_7.gml @@ -0,0 +1,4 @@ +/// @description Insert description here +// You can write your code in this editor +game_restart() + diff --git a/objects/obj_game/Create_0.gml b/objects/obj_game/Create_0.gml index f589aa9..d3fec52 100644 --- a/objects/obj_game/Create_0.gml +++ b/objects/obj_game/Create_0.gml @@ -9,4 +9,8 @@ doTimer = true; allowMovement = true; bossText = false; bossHealthBar = false; -audio_play_sound(snd_bgmusic_space, 1, true); \ No newline at end of file +audio_play_sound(snd_bgmusic_space, 1, true); +bossDead = false +outOfTime = false +pause = false +score = 0; \ No newline at end of file diff --git a/objects/obj_game/Draw_0.gml b/objects/obj_game/Draw_0.gml index 64d926f..24ffe84 100644 --- a/objects/obj_game/Draw_0.gml +++ b/objects/obj_game/Draw_0.gml @@ -1,18 +1,25 @@ /// @description Insert description here // You can write your code in this editor -draw_set_colour(c_red); -draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 32, health, 3, 3, 0); -draw_set_colour(c_black); -draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 10, "HEALTH: ", 2, 2, 0); -draw_set_colour(c_red); -draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 128, lives, 3, 3, 0); -draw_set_colour(c_black); -draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 96, "LIVES: ", 2, 2, 0); +// Health + draw_set_colour(c_red); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 32, health, 3, 3, 0); + draw_set_colour(c_black); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 2, "HEALTH: ", 2, 2, 0); +// Lives + draw_set_colour(c_red); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 128, lives, 3, 3, 0); + draw_set_colour(c_black); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 96, "LIVES: ", 2, 2, 0); +// Score + draw_set_colour(c_red); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 216, score, 3, 3, 0); + draw_set_colour(c_black); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 182, "SCORE: ", 2, 2, 0); //draw_set_colour(c_purple); //draw_text_transformed(camera_get_view_x(view_camera[0]) + 16, camera_get_view_y(view_camera[0]) + 186, "(just for testing) NUMENEMIES: ", 1, 1, 0); //for testing the number of enemies in the game -draw_set_colour(c_purple); -draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 220, numEnemies, 2, 2, 0); +//draw_set_colour(c_purple); +//draw_text_transformed(camera_get_view_x(view_camera[0]) + 32, camera_get_view_y(view_camera[0]) + 220, numEnemies, 2, 2, 0); //timer draw_set_colour(c_blue); draw_text_transformed(camera_get_view_x(view_camera[0]) + 650, camera_get_view_y(view_camera[0]) + 32, timer, 2, 2, 0); @@ -25,4 +32,12 @@ if (bossText = true) { if (bossHealthBar = true) and (instance_exists(obj_miniBoss)) { draw_set_colour(c_red); draw_healthbar(obj_miniBoss.x-50, obj_miniBoss.y-50, obj_miniBoss.x+50, obj_miniBoss.y-75, obj_miniBoss.bossHealth, c_black, c_red, c_lime, 0, true, true) -} \ No newline at end of file +} +if (bossDead = true) { + draw_set_colour(c_red); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 200, camera_get_view_y(view_camera[0]) + 300, "END", 5, 5, 0); +} +if (outOfTime = true) { + draw_set_colour(c_red); + draw_text_transformed(camera_get_view_x(view_camera[0]) + 200, camera_get_view_y(view_camera[0]) + 300, "OUT OF TIME", 5, 5, 0) +} diff --git a/objects/obj_game/Step_0.gml b/objects/obj_game/Step_0.gml index 59445c6..4a6c25b 100644 --- a/objects/obj_game/Step_0.gml +++ b/objects/obj_game/Step_0.gml @@ -23,7 +23,7 @@ if (asecond == true) and (obj_player.states == States.regular) and (doTimer == t alarm[3] = 60; } -if (timer = 198) { +if (timer = 150) { doTimer = false allowMovement= false; instance_destroy(obj_spawnEnemy1) @@ -41,7 +41,7 @@ if (timer = 198) { } -if (timer = 196) { +if (timer = 100) { if (instance_exists(obj_miniBoss)) { instance_destroy(obj_miniBoss) } @@ -53,7 +53,7 @@ if (timer = 196) { } -if (timer = 194) { +if (timer = 50) { bossText = true; doTimer = false numEnemies = 0; @@ -66,4 +66,15 @@ if (timer = 194) { instance_destroy(obj_enemy2) instance_destroy(obj_enemy3) alarm[6] = 60 -} \ No newline at end of file +} + +if (timer = 0) and (instance_exists(obj_boss)) { + outOfTime = true + allowMovement = false + obj_boss.movementSpeed = 0 + if (instance_exists(obj_enemy2)) { + instance_destroy(obj_enemy2) + instance_destroy(obj_spawnEnemy2) + } + alarm[7] = 120 +} diff --git a/objects/obj_game/obj_game.yy b/objects/obj_game/obj_game.yy index ea18508..7fb886a 100644 --- a/objects/obj_game/obj_game.yy +++ b/objects/obj_game/obj_game.yy @@ -13,6 +13,7 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":4,"eventType":2,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":5,"eventType":2,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":6,"eventType":2,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":7,"eventType":2,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], diff --git a/objects/obj_miniBoss/Create_0.gml b/objects/obj_miniBoss/Create_0.gml index 3be205b..dc5cf00 100644 --- a/objects/obj_miniBoss/Create_0.gml +++ b/objects/obj_miniBoss/Create_0.gml @@ -1,6 +1,6 @@ /// @description Insert description here // You can write your code in this editor -bossHealth = 100; +bossHealth = 100; // nerfed boss health from 100 to 80 canShoot = true; pointingDirection = 0; canMelee = true; diff --git a/objects/obj_miniBoss/Step_0.gml b/objects/obj_miniBoss/Step_0.gml index d1cfdd7..7eabfb6 100644 --- a/objects/obj_miniBoss/Step_0.gml +++ b/objects/obj_miniBoss/Step_0.gml @@ -34,6 +34,6 @@ if (obj_player.states = States.regular) and (obj_game.dying = false) { if (bossHealth <= 0) { obj_game.bossHealthBar = false; instance_destroy() - obj_game.timer = 150 + obj_game.timer = 101 } diff --git a/objects/obj_miniBoss/obj_miniBoss.yy b/objects/obj_miniBoss/obj_miniBoss.yy index cd8f345..ff052e4 100644 --- a/objects/obj_miniBoss/obj_miniBoss.yy +++ b/objects/obj_miniBoss/obj_miniBoss.yy @@ -31,7 +31,7 @@ "physicsShapePoints": [], "physicsStartAwake": true, "properties": [ - {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"movementSpeed","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"7","varType":1,}, + {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"movementSpeed","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"5","varType":1,}, ], "solid": false, "spriteId": { diff --git a/objects/obj_player/Collision_obj_enemyBullet1.gml b/objects/obj_player/Collision_obj_enemyBullet1.gml new file mode 100644 index 0000000..0217da1 --- /dev/null +++ b/objects/obj_player/Collision_obj_enemyBullet1.gml @@ -0,0 +1,7 @@ +/// @description Colliding with any bullet +if (obj_game.dying = false) +{ + health -= 1; + alarm[2] = game_get_speed(gamespeed_fps); +} +instance_destroy(other); \ No newline at end of file diff --git a/objects/obj_player/Create_0.gml b/objects/obj_player/Create_0.gml index 415ab7f..32f359d 100644 --- a/objects/obj_player/Create_0.gml +++ b/objects/obj_player/Create_0.gml @@ -10,6 +10,7 @@ enum States { dead } states = States.cutscene -health = 15; -lives = 5; +health = 8; // nerfed from 15 to 8 +lives = 3; // nerfed from 5 to 3 dying = false; + diff --git a/objects/obj_player/Draw_0-TI84CalculatorSupreme.gml b/objects/obj_player/Draw_0-TI84CalculatorSupreme.gml new file mode 100644 index 0000000..2d6772e --- /dev/null +++ b/objects/obj_player/Draw_0-TI84CalculatorSupreme.gml @@ -0,0 +1,6 @@ +/// @description Make it easier to see the player while they are in space +draw_sprite_ext(spr_player,0,x,y,image_xscale,image_yscale,90,-1,1); +if(obj_game.timer <= 100) +{ + draw_sprite_ext(spr_glowPlayer,0,x,y,0.06,0.06,0,-1,1); // Taken from opengameart.org: Glow Circle by oglsdl Public Domain License +} \ No newline at end of file diff --git a/objects/obj_player/Draw_0.gml b/objects/obj_player/Draw_0.gml new file mode 100644 index 0000000..2d6772e --- /dev/null +++ b/objects/obj_player/Draw_0.gml @@ -0,0 +1,6 @@ +/// @description Make it easier to see the player while they are in space +draw_sprite_ext(spr_player,0,x,y,image_xscale,image_yscale,90,-1,1); +if(obj_game.timer <= 100) +{ + draw_sprite_ext(spr_glowPlayer,0,x,y,0.06,0.06,0,-1,1); // Taken from opengameart.org: Glow Circle by oglsdl Public Domain License +} \ No newline at end of file diff --git a/objects/obj_player/Step_0.gml b/objects/obj_player/Step_0.gml index e97cc42..3b75eb2 100644 --- a/objects/obj_player/Step_0.gml +++ b/objects/obj_player/Step_0.gml @@ -22,6 +22,12 @@ x = clamp(x, camera_get_view_x(view_camera[0]), room_width); y = clamp(y, camera_get_view_y(view_camera[0]), camera_get_view_y(view_camera[0])+768); //dev -if (keyboard_check_pressed(vk_backspace)) { +if (keyboard_check_pressed(vk_backspace)) {//testing player death health -= 1; +} +if (keyboard_check_pressed(vk_enter) and instance_exists(obj_boss)) { + obj_boss.bossHealth -= 50 //testing killing the boss +} +if (keyboard_check_pressed(vk_alt)) { + obj_game.timer -= 1//use this to progress through the stages faster } \ No newline at end of file diff --git a/objects/obj_player/obj_player.yy b/objects/obj_player/obj_player.yy index c791bc3..7a45149 100644 --- a/objects/obj_player/obj_player.yy +++ b/objects/obj_player/obj_player.yy @@ -8,6 +8,8 @@ {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":2,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":1,"isDnD":false,}, {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":1,"eventType":2,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":{"name":"obj_enemyBullet1","path":"objects/obj_enemyBullet1/obj_enemyBullet1.yy",},"eventNum":0,"eventType":4,"isDnD":false,}, + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, ], "managed": true, "overriddenProperties": [], @@ -31,7 +33,7 @@ "physicsStartAwake": true, "properties": [ {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"movementSpeed","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"4","varType":1,}, - {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"shotSpeed","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"5","varType":1,}, + {"resourceType":"GMObjectProperty","resourceVersion":"1.0","name":"shotSpeed","filters":[],"listItems":[],"multiselect":false,"rangeEnabled":false,"rangeMax":10.0,"rangeMin":0.0,"value":"10","varType":1,}, ], "solid": false, "spriteId": { diff --git a/objects/obj_playerBullet1/Collision_obj_enemy1.gml b/objects/obj_playerBullet1/Collision_obj_enemy1.gml index 8f70aa8..b511370 100644 --- a/objects/obj_playerBullet1/Collision_obj_enemy1.gml +++ b/objects/obj_playerBullet1/Collision_obj_enemy1.gml @@ -1,4 +1,5 @@ -/// @description Insert description here + /// @description Insert description here // You can write your code in this editor instance_destroy(other); obj_game.numEnemies -= 1; +score += other.enemy_score; diff --git a/objects/obj_spawnEnemy1/Step_0.gml b/objects/obj_spawnEnemy1/Step_0.gml index de07098..169a750 100644 --- a/objects/obj_spawnEnemy1/Step_0.gml +++ b/objects/obj_spawnEnemy1/Step_0.gml @@ -6,6 +6,6 @@ if (canSpawn = true) and (obj_game.numEnemies < 10) and (obj_player.states = Sta instance_create_layer(irandom_range(0, camera_get_view_width(view_camera[0]) + sprite_width/2), camera_get_view_y(view_camera[0]) - (sprite_height/2), "Instances", obj_enemy1); //testline canSpawn = false - alarm[0] = 60 + alarm[0] = 120 // adjusted from 60 to 120 } diff --git a/objects/obj_spawnEnemy2/Step_0.gml b/objects/obj_spawnEnemy2/Step_0.gml index c00c3dc..2953779 100644 --- a/objects/obj_spawnEnemy2/Step_0.gml +++ b/objects/obj_spawnEnemy2/Step_0.gml @@ -4,9 +4,8 @@ if (canSpawn = true) and (obj_game.numEnemies < 10) and (obj_player.states = States.regular) { instance_create_layer(irandom_range(0, camera_get_view_width(view_camera[0]) + sprite_width/2), camera_get_view_y(view_camera[0]) - (sprite_height/2), "Instances", obj_enemy2); -//testline canSpawn = false - alarm[0] = 120 + alarm[0] = 60 // adjusted from 120 to 60 } diff --git a/objects/obj_story/Draw_0.gml b/objects/obj_story/Draw_0.gml new file mode 100644 index 0000000..515e0d1 --- /dev/null +++ b/objects/obj_story/Draw_0.gml @@ -0,0 +1,13 @@ +/// @description Insert description here +// You can write your code in this editor + +draw_set_color(c_black); +draw_set_halign(fa_left); +draw_set_valign(fa_top); + +draw_text(100, 80,"year: 30XX"); +draw_text(100, 180, "Earth is invaded by an alien species known as the Crons!"); +draw_text(100, 240, "Pilot Hale, a spacecraft, to deal with as many of them as"); +draw_text(100, 270, "you can and show the Crons what you're made of!"); +draw_text(100, 300, "Can you repel the invasion long enough for reinforcements"); +draw_text(100, 330, "to arrive or will you be killed?"); diff --git a/objects/obj_story/obj_story.yy b/objects/obj_story/obj_story.yy new file mode 100644 index 0000000..4705e82 --- /dev/null +++ b/objects/obj_story/obj_story.yy @@ -0,0 +1,33 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_story", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "obj_text", + "path": "folders/Objects/obj_text.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/objects/obj_tutorial/Draw_0.gml b/objects/obj_tutorial/Draw_0.gml new file mode 100644 index 0000000..4a7753b --- /dev/null +++ b/objects/obj_tutorial/Draw_0.gml @@ -0,0 +1,24 @@ +/// @description Insert description here +// You can write your code in this editor + + +draw_set_color(c_black); +draw_set_halign(fa_left); +draw_set_valign(fa_top); + +draw_text(100, 50, "How to Play"); +draw_text(50,100, "Use the Arrow-keys to move around the space provided."); +draw_text(50,130, "-Up to move upwards"); +draw_text(50,160, "-Down to move downwards"); +draw_text(50,190, "-Left to move left"); +draw_text(50,220, "-Right to move right"); +draw_text(50,270, "hold or press space to fire and kill enemies!"); +draw_text(100,320, "Game Info"); +draw_text(50,370, "You have a total of 8 hp (health points) and 3 lives"); +draw_text(50,400, "Colliding with enemies or bullets will harm you!"); +draw_text(50,450, "In the top corner there is a 200 second timer that represents"); +draw_text(50,480, "the progression of the game."); +draw_text(50,510, "To win the game, the player must either survive long enough"); +draw_text(50,540, "against the final boss or kill him."); +draw_text(50,570, "The player losses if they lose all 3 lives."); +draw_text(50,600, "A score will be represented showing the player's performance."); diff --git a/objects/obj_tutorial/obj_tutorial.yy b/objects/obj_tutorial/obj_tutorial.yy new file mode 100644 index 0000000..7131c4f --- /dev/null +++ b/objects/obj_tutorial/obj_tutorial.yy @@ -0,0 +1,33 @@ +{ + "resourceType": "GMObject", + "resourceVersion": "1.0", + "name": "obj_tutorial", + "eventList": [ + {"resourceType":"GMEvent","resourceVersion":"1.0","name":"","collisionObjectId":null,"eventNum":0,"eventType":8,"isDnD":false,}, + ], + "managed": true, + "overriddenProperties": [], + "parent": { + "name": "obj_text", + "path": "folders/Objects/obj_text.yy", + }, + "parentObjectId": null, + "persistent": false, + "physicsAngularDamping": 0.1, + "physicsDensity": 0.5, + "physicsFriction": 0.2, + "physicsGroup": 1, + "physicsKinematic": false, + "physicsLinearDamping": 0.1, + "physicsObject": false, + "physicsRestitution": 0.1, + "physicsSensor": false, + "physicsShape": 1, + "physicsShapePoints": [], + "physicsStartAwake": true, + "properties": [], + "solid": false, + "spriteId": null, + "spriteMaskId": null, + "visible": true, +} \ No newline at end of file diff --git a/rooms/rm_credits/rm_credits.yy b/rooms/rm_credits/rm_credits.yy new file mode 100644 index 0000000..4cb4b99 --- /dev/null +++ b/rooms/rm_credits/rm_credits.yy @@ -0,0 +1,57 @@ +{ + "resourceType": "GMRoom", + "resourceVersion": "1.0", + "name": "rm_credits", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrder": [ + {"name":"inst_5739BB73","path":"rooms/rm_credits/rm_credits.yy",}, + {"name":"inst_997F902","path":"rooms/rm_credits/rm_credits.yy",}, + ], + "isDnd": false, + "layers": [ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_5739BB73","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonMenu","path":"objects/obj_buttonMenu/obj_buttonMenu.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":544.0,"y":704.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_997F902","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_credits","path":"objects/obj_credits/obj_credits.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":608.0,"y":160.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":30.0,"animationSpeedType":0,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_tempbackground","path":"sprites/spr_tempbackground/spr_tempbackground.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + ], + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "parentRoom": null, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "roomSettings": { + "Height": 768, + "inheritRoomSettings": false, + "persistent": false, + "Width": 722, + }, + "sequenceId": null, + "views": [ + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + ], + "viewSettings": { + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + }, + "volume": 1.0, +} \ No newline at end of file diff --git a/rooms/rm_menu/rm_menu.yy b/rooms/rm_menu/rm_menu.yy new file mode 100644 index 0000000..014d420 --- /dev/null +++ b/rooms/rm_menu/rm_menu.yy @@ -0,0 +1,63 @@ +{ + "resourceType": "GMRoom", + "resourceVersion": "1.0", + "name": "rm_menu", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrder": [ + {"name":"inst_474D3F41","path":"rooms/rm_menu/rm_menu.yy",}, + {"name":"inst_272BF482","path":"rooms/rm_menu/rm_menu.yy",}, + {"name":"inst_1D59B08C","path":"rooms/rm_menu/rm_menu.yy",}, + {"name":"inst_7E5FED28","path":"rooms/rm_menu/rm_menu.yy",}, + {"name":"inst_2B1ACB46","path":"rooms/rm_menu/rm_menu.yy",}, + ], + "isDnd": false, + "layers": [ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_474D3F41","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonPlay","path":"objects/obj_buttonPlay/obj_buttonPlay.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":96.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_272BF482","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonQuit","path":"objects/obj_buttonQuit/obj_buttonQuit.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":672.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_1D59B08C","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonTutorial","path":"objects/obj_buttonTutorial/obj_buttonTutorial.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":224.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_7E5FED28","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonStory","path":"objects/obj_buttonStory/obj_buttonStory.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":352.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_2B1ACB46","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonCredits","path":"objects/obj_buttonCredits/obj_buttonCredits.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":160.0,"y":480.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":30.0,"animationSpeedType":0,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_tempbackground","path":"sprites/spr_tempbackground/spr_tempbackground.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + ], + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "parentRoom": null, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "roomSettings": { + "Height": 768, + "inheritRoomSettings": false, + "persistent": false, + "Width": 722, + }, + "sequenceId": null, + "views": [ + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + ], + "viewSettings": { + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + }, + "volume": 1.0, +} \ No newline at end of file diff --git a/rooms/rm_testing/rm_testing.yy b/rooms/rm_story/rm_story.yy similarity index 64% rename from rooms/rm_testing/rm_testing.yy rename to rooms/rm_story/rm_story.yy index bd21c79..7422137 100644 --- a/rooms/rm_testing/rm_testing.yy +++ b/rooms/rm_story/rm_story.yy @@ -1,16 +1,22 @@ { "resourceType": "GMRoom", "resourceVersion": "1.0", - "name": "rm_testing", + "name": "rm_story", "creationCodeFile": "", "inheritCode": false, "inheritCreationOrder": false, "inheritLayers": false, - "instanceCreationOrder": [], + "instanceCreationOrder": [ + {"name":"inst_6E8C271A","path":"rooms/rm_story/rm_story.yy",}, + {"name":"inst_6D925678","path":"rooms/rm_story/rm_story.yy",}, + ], "isDnd": false, "layers": [ - {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, - {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":15.0,"animationSpeedType":0,"colour":4290822336,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":null,"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6E8C271A","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonMenu","path":"objects/obj_buttonMenu/obj_buttonMenu.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":544.0,"y":704.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_6D925678","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_story","path":"objects/obj_story/obj_story.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":576.0,"y":192.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":30.0,"animationSpeedType":0,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_tempbackground","path":"sprites/spr_tempbackground/spr_tempbackground.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, ], "parent": { "name": "Rooms", @@ -28,7 +34,7 @@ "Height": 768, "inheritRoomSettings": false, "persistent": false, - "Width": 1366, + "Width": 722, }, "sequenceId": null, "views": [ diff --git a/rooms/rm_tutorial/rm_tutorial.yy b/rooms/rm_tutorial/rm_tutorial.yy new file mode 100644 index 0000000..ff1f39f --- /dev/null +++ b/rooms/rm_tutorial/rm_tutorial.yy @@ -0,0 +1,57 @@ +{ + "resourceType": "GMRoom", + "resourceVersion": "1.0", + "name": "rm_tutorial", + "creationCodeFile": "", + "inheritCode": false, + "inheritCreationOrder": false, + "inheritLayers": false, + "instanceCreationOrder": [ + {"name":"inst_69BC0A22","path":"rooms/rm_tutorial/rm_tutorial.yy",}, + {"name":"inst_1E96EBA5","path":"rooms/rm_tutorial/rm_tutorial.yy",}, + ], + "isDnd": false, + "layers": [ + {"resourceType":"GMRInstanceLayer","resourceVersion":"1.0","name":"Instances","depth":0,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"instances":[ + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_69BC0A22","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_buttonMenu","path":"objects/obj_buttonMenu/obj_buttonMenu.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":544.0,"y":704.0,}, + {"resourceType":"GMRInstance","resourceVersion":"1.0","name":"inst_1E96EBA5","colour":4294967295,"frozen":false,"hasCreationCode":false,"ignore":false,"imageIndex":0,"imageSpeed":1.0,"inheritCode":false,"inheritedItemId":null,"inheritItemSettings":false,"isDnd":false,"objectId":{"name":"obj_tutorial","path":"objects/obj_tutorial/obj_tutorial.yy",},"properties":[],"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"x":640.0,"y":160.0,}, + ],"layers":[],"properties":[],"userdefinedDepth":false,"visible":true,}, + {"resourceType":"GMRBackgroundLayer","resourceVersion":"1.0","name":"Background","animationFPS":30.0,"animationSpeedType":0,"colour":4294967295,"depth":100,"effectEnabled":true,"effectType":null,"gridX":32,"gridY":32,"hierarchyFrozen":false,"hspeed":0.0,"htiled":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"inheritSubLayers":true,"inheritVisibility":true,"layers":[],"properties":[],"spriteId":{"name":"spr_tempbackground","path":"sprites/spr_tempbackground/spr_tempbackground.yy",},"stretch":false,"userdefinedAnimFPS":false,"userdefinedDepth":false,"visible":true,"vspeed":0.0,"vtiled":false,"x":0,"y":0,}, + ], + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "parentRoom": null, + "physicsSettings": { + "inheritPhysicsSettings": false, + "PhysicsWorld": false, + "PhysicsWorldGravityX": 0.0, + "PhysicsWorldGravityY": 10.0, + "PhysicsWorldPixToMetres": 0.1, + }, + "roomSettings": { + "Height": 768, + "inheritRoomSettings": false, + "persistent": false, + "Width": 722, + }, + "sequenceId": null, + "views": [ + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + {"hborder":32,"hport":768,"hspeed":-1,"hview":768,"inherit":false,"objectId":null,"vborder":32,"visible":false,"vspeed":-1,"wport":1366,"wview":1366,"xport":0,"xview":0,"yport":0,"yview":0,}, + ], + "viewSettings": { + "clearDisplayBuffer": true, + "clearViewBackground": false, + "enableViews": false, + "inheritViewSettings": false, + }, + "volume": 1.0, +} \ No newline at end of file diff --git a/sprites/Sprite21/1a1b495e-536e-4e56-b252-990c6132ebd7.png b/sprites/Sprite21/1a1b495e-536e-4e56-b252-990c6132ebd7.png new file mode 100644 index 0000000..dabec22 Binary files /dev/null and b/sprites/Sprite21/1a1b495e-536e-4e56-b252-990c6132ebd7.png differ diff --git a/sprites/Sprite21/Sprite21.yy b/sprites/Sprite21/Sprite21.yy new file mode 100644 index 0000000..7398f3c --- /dev/null +++ b/sprites/Sprite21/Sprite21.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "Sprite21", + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1a1b495e-536e-4e56-b252-990c6132ebd7",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c9297183-0b6c-45e7-845a-608e3c76665f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Rooms", + "path": "folders/Rooms.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "Sprite21", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1a1b495e-536e-4e56-b252-990c6132ebd7","path":"sprites/Sprite21/Sprite21.yy",},},},"Disabled":false,"id":"476f94ec-db72-4a57-937e-d0d278292bfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/sprites/Sprite21/layers/1a1b495e-536e-4e56-b252-990c6132ebd7/c9297183-0b6c-45e7-845a-608e3c76665f.png b/sprites/Sprite21/layers/1a1b495e-536e-4e56-b252-990c6132ebd7/c9297183-0b6c-45e7-845a-608e3c76665f.png new file mode 100644 index 0000000..dabec22 Binary files /dev/null and b/sprites/Sprite21/layers/1a1b495e-536e-4e56-b252-990c6132ebd7/c9297183-0b6c-45e7-845a-608e3c76665f.png differ diff --git a/sprites/spr_boss/1da9c3a1-96bd-482b-a09c-864e74ba4d34.png b/sprites/spr_boss/1da9c3a1-96bd-482b-a09c-864e74ba4d34.png index bbbe9b7..93da33a 100644 Binary files a/sprites/spr_boss/1da9c3a1-96bd-482b-a09c-864e74ba4d34.png and b/sprites/spr_boss/1da9c3a1-96bd-482b-a09c-864e74ba4d34.png differ diff --git a/sprites/spr_boss/e1a19c57-c095-43b0-a330-db4ae0ff9154.png b/sprites/spr_boss/e1a19c57-c095-43b0-a330-db4ae0ff9154.png index 416a16a..5357675 100644 Binary files a/sprites/spr_boss/e1a19c57-c095-43b0-a330-db4ae0ff9154.png and b/sprites/spr_boss/e1a19c57-c095-43b0-a330-db4ae0ff9154.png differ diff --git a/sprites/spr_boss/layers/1da9c3a1-96bd-482b-a09c-864e74ba4d34/42e5d652-5133-4343-a647-b364e10828ef.png b/sprites/spr_boss/layers/1da9c3a1-96bd-482b-a09c-864e74ba4d34/42e5d652-5133-4343-a647-b364e10828ef.png index bbbe9b7..93da33a 100644 Binary files a/sprites/spr_boss/layers/1da9c3a1-96bd-482b-a09c-864e74ba4d34/42e5d652-5133-4343-a647-b364e10828ef.png and b/sprites/spr_boss/layers/1da9c3a1-96bd-482b-a09c-864e74ba4d34/42e5d652-5133-4343-a647-b364e10828ef.png differ diff --git a/sprites/spr_boss/layers/e1a19c57-c095-43b0-a330-db4ae0ff9154/42e5d652-5133-4343-a647-b364e10828ef.png b/sprites/spr_boss/layers/e1a19c57-c095-43b0-a330-db4ae0ff9154/42e5d652-5133-4343-a647-b364e10828ef.png index 416a16a..5357675 100644 Binary files a/sprites/spr_boss/layers/e1a19c57-c095-43b0-a330-db4ae0ff9154/42e5d652-5133-4343-a647-b364e10828ef.png and b/sprites/spr_boss/layers/e1a19c57-c095-43b0-a330-db4ae0ff9154/42e5d652-5133-4343-a647-b364e10828ef.png differ diff --git a/sprites/spr_bullet/18f87d4f-b22d-471c-8d52-b3f09fa04033.png b/sprites/spr_bullet/18f87d4f-b22d-471c-8d52-b3f09fa04033.png index 6a04792..bb9cf73 100644 Binary files a/sprites/spr_bullet/18f87d4f-b22d-471c-8d52-b3f09fa04033.png and b/sprites/spr_bullet/18f87d4f-b22d-471c-8d52-b3f09fa04033.png differ diff --git a/sprites/spr_bullet/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac.png b/sprites/spr_bullet/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac.png index f1354b9..1c383e5 100644 Binary files a/sprites/spr_bullet/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac.png and b/sprites/spr_bullet/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac.png differ diff --git a/sprites/spr_bullet/layers/18f87d4f-b22d-471c-8d52-b3f09fa04033/845a6df0-d339-40c4-904a-0207f4f6dfc7.png b/sprites/spr_bullet/layers/18f87d4f-b22d-471c-8d52-b3f09fa04033/845a6df0-d339-40c4-904a-0207f4f6dfc7.png index 6a04792..bb9cf73 100644 Binary files a/sprites/spr_bullet/layers/18f87d4f-b22d-471c-8d52-b3f09fa04033/845a6df0-d339-40c4-904a-0207f4f6dfc7.png and b/sprites/spr_bullet/layers/18f87d4f-b22d-471c-8d52-b3f09fa04033/845a6df0-d339-40c4-904a-0207f4f6dfc7.png differ diff --git a/sprites/spr_bullet/layers/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac/845a6df0-d339-40c4-904a-0207f4f6dfc7.png b/sprites/spr_bullet/layers/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac/845a6df0-d339-40c4-904a-0207f4f6dfc7.png index f1354b9..1c383e5 100644 Binary files a/sprites/spr_bullet/layers/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac/845a6df0-d339-40c4-904a-0207f4f6dfc7.png and b/sprites/spr_bullet/layers/c8da60d8-b7f7-4f1c-861e-eb9ce50622ac/845a6df0-d339-40c4-904a-0207f4f6dfc7.png differ diff --git a/sprites/spr_button/a9dcbe41-1d34-4810-b863-acfc23761fbd.png b/sprites/spr_button/a9dcbe41-1d34-4810-b863-acfc23761fbd.png new file mode 100644 index 0000000..77222e2 Binary files /dev/null and b/sprites/spr_button/a9dcbe41-1d34-4810-b863-acfc23761fbd.png differ diff --git a/sprites/spr_button/layers/a9dcbe41-1d34-4810-b863-acfc23761fbd/c6b0a747-24ae-45f9-87d3-3a32bcd67c77.png b/sprites/spr_button/layers/a9dcbe41-1d34-4810-b863-acfc23761fbd/c6b0a747-24ae-45f9-87d3-3a32bcd67c77.png new file mode 100644 index 0000000..77222e2 Binary files /dev/null and b/sprites/spr_button/layers/a9dcbe41-1d34-4810-b863-acfc23761fbd/c6b0a747-24ae-45f9-87d3-3a32bcd67c77.png differ diff --git a/sprites/spr_button/spr_button.yy b/sprites/spr_button/spr_button.yy new file mode 100644 index 0000000..719f849 --- /dev/null +++ b/sprites/spr_button/spr_button.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_button", + "bbox_bottom": 62, + "bbox_left": 1, + "bbox_right": 254, + "bbox_top": 1, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"a9dcbe41-1d34-4810-b863-acfc23761fbd",}, + ], + "gridX": 0, + "gridY": 0, + "height": 65, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c6b0a747-24ae-45f9-87d3-3a32bcd67c77","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_button", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": true, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"a9dcbe41-1d34-4810-b863-acfc23761fbd","path":"sprites/spr_button/spr_button.yy",},},},"Disabled":false,"id":"fe8fd938-9237-4c73-9087-405476cecb1a","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 128, + "yorigin": 32, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 256, +} \ No newline at end of file diff --git a/sprites/spr_directions/764ea4e3-b659-4795-b5e3-21945139e1a1.png b/sprites/spr_directions/764ea4e3-b659-4795-b5e3-21945139e1a1.png new file mode 100644 index 0000000..b428363 Binary files /dev/null and b/sprites/spr_directions/764ea4e3-b659-4795-b5e3-21945139e1a1.png differ diff --git a/sprites/spr_directions/layers/764ea4e3-b659-4795-b5e3-21945139e1a1/a3922145-5df9-4def-858b-59dbdd69f0bd.png b/sprites/spr_directions/layers/764ea4e3-b659-4795-b5e3-21945139e1a1/a3922145-5df9-4def-858b-59dbdd69f0bd.png new file mode 100644 index 0000000..b428363 Binary files /dev/null and b/sprites/spr_directions/layers/764ea4e3-b659-4795-b5e3-21945139e1a1/a3922145-5df9-4def-858b-59dbdd69f0bd.png differ diff --git a/sprites/spr_directions/spr_directions.yy b/sprites/spr_directions/spr_directions.yy new file mode 100644 index 0000000..7547ae6 --- /dev/null +++ b/sprites/spr_directions/spr_directions.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_directions", + "bbox_bottom": 0, + "bbox_left": 0, + "bbox_right": 0, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"764ea4e3-b659-4795-b5e3-21945139e1a1",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"a3922145-5df9-4def-858b-59dbdd69f0bd","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_directions", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"764ea4e3-b659-4795-b5e3-21945139e1a1","path":"sprites/spr_directions/spr_directions.yy",},},},"Disabled":false,"id":"f908a6f6-aba5-434c-95d1-f506dab9b44d","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/sprites/spr_enemy1/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3.png b/sprites/spr_enemy1/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3.png index 8015d0f..5f05a23 100644 Binary files a/sprites/spr_enemy1/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3.png and b/sprites/spr_enemy1/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3.png differ diff --git a/sprites/spr_enemy1/db5b42a1-17b9-4496-bcbe-ff3e9c629c84.png b/sprites/spr_enemy1/db5b42a1-17b9-4496-bcbe-ff3e9c629c84.png index 607dbec..41e19e4 100644 Binary files a/sprites/spr_enemy1/db5b42a1-17b9-4496-bcbe-ff3e9c629c84.png and b/sprites/spr_enemy1/db5b42a1-17b9-4496-bcbe-ff3e9c629c84.png differ diff --git a/sprites/spr_enemy1/layers/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3/69dd225a-5401-48ff-8ea7-6fa49388a089.png b/sprites/spr_enemy1/layers/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3/69dd225a-5401-48ff-8ea7-6fa49388a089.png index 8015d0f..5f05a23 100644 Binary files a/sprites/spr_enemy1/layers/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3/69dd225a-5401-48ff-8ea7-6fa49388a089.png and b/sprites/spr_enemy1/layers/6cd455a7-1f0e-4c8e-a19d-1d57196c26e3/69dd225a-5401-48ff-8ea7-6fa49388a089.png differ diff --git a/sprites/spr_enemy1/layers/db5b42a1-17b9-4496-bcbe-ff3e9c629c84/69dd225a-5401-48ff-8ea7-6fa49388a089.png b/sprites/spr_enemy1/layers/db5b42a1-17b9-4496-bcbe-ff3e9c629c84/69dd225a-5401-48ff-8ea7-6fa49388a089.png index 607dbec..41e19e4 100644 Binary files a/sprites/spr_enemy1/layers/db5b42a1-17b9-4496-bcbe-ff3e9c629c84/69dd225a-5401-48ff-8ea7-6fa49388a089.png and b/sprites/spr_enemy1/layers/db5b42a1-17b9-4496-bcbe-ff3e9c629c84/69dd225a-5401-48ff-8ea7-6fa49388a089.png differ diff --git a/sprites/spr_enemy2/1d8d7a8c-9752-4369-92f2-af4fae6e5823.png b/sprites/spr_enemy2/1d8d7a8c-9752-4369-92f2-af4fae6e5823.png index 8c3de08..ae62f64 100644 Binary files a/sprites/spr_enemy2/1d8d7a8c-9752-4369-92f2-af4fae6e5823.png and b/sprites/spr_enemy2/1d8d7a8c-9752-4369-92f2-af4fae6e5823.png differ diff --git a/sprites/spr_enemy2/85f8b0b5-6897-498f-8980-e6f921f7e315.png b/sprites/spr_enemy2/85f8b0b5-6897-498f-8980-e6f921f7e315.png index 5b32b78..92cef23 100644 Binary files a/sprites/spr_enemy2/85f8b0b5-6897-498f-8980-e6f921f7e315.png and b/sprites/spr_enemy2/85f8b0b5-6897-498f-8980-e6f921f7e315.png differ diff --git a/sprites/spr_enemy2/layers/1d8d7a8c-9752-4369-92f2-af4fae6e5823/b2f89af9-bb82-4cfd-a907-531b237675f3.png b/sprites/spr_enemy2/layers/1d8d7a8c-9752-4369-92f2-af4fae6e5823/b2f89af9-bb82-4cfd-a907-531b237675f3.png index 8c3de08..ae62f64 100644 Binary files a/sprites/spr_enemy2/layers/1d8d7a8c-9752-4369-92f2-af4fae6e5823/b2f89af9-bb82-4cfd-a907-531b237675f3.png and b/sprites/spr_enemy2/layers/1d8d7a8c-9752-4369-92f2-af4fae6e5823/b2f89af9-bb82-4cfd-a907-531b237675f3.png differ diff --git a/sprites/spr_enemy2/layers/85f8b0b5-6897-498f-8980-e6f921f7e315/b2f89af9-bb82-4cfd-a907-531b237675f3.png b/sprites/spr_enemy2/layers/85f8b0b5-6897-498f-8980-e6f921f7e315/b2f89af9-bb82-4cfd-a907-531b237675f3.png index 5b32b78..92cef23 100644 Binary files a/sprites/spr_enemy2/layers/85f8b0b5-6897-498f-8980-e6f921f7e315/b2f89af9-bb82-4cfd-a907-531b237675f3.png and b/sprites/spr_enemy2/layers/85f8b0b5-6897-498f-8980-e6f921f7e315/b2f89af9-bb82-4cfd-a907-531b237675f3.png differ diff --git a/sprites/spr_enemy3/73acacdc-a11a-4794-932e-25e5ae726be9.png b/sprites/spr_enemy3/73acacdc-a11a-4794-932e-25e5ae726be9.png index c8de50e..645d217 100644 Binary files a/sprites/spr_enemy3/73acacdc-a11a-4794-932e-25e5ae726be9.png and b/sprites/spr_enemy3/73acacdc-a11a-4794-932e-25e5ae726be9.png differ diff --git a/sprites/spr_enemy3/d8b82cf1-201c-46de-9adc-d1a180d8efc8.png b/sprites/spr_enemy3/d8b82cf1-201c-46de-9adc-d1a180d8efc8.png index c61b820..6819a82 100644 Binary files a/sprites/spr_enemy3/d8b82cf1-201c-46de-9adc-d1a180d8efc8.png and b/sprites/spr_enemy3/d8b82cf1-201c-46de-9adc-d1a180d8efc8.png differ diff --git a/sprites/spr_enemy3/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png b/sprites/spr_enemy3/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png index c8de50e..645d217 100644 Binary files a/sprites/spr_enemy3/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png and b/sprites/spr_enemy3/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png differ diff --git a/sprites/spr_enemy3/layers/d8b82cf1-201c-46de-9adc-d1a180d8efc8/7b1f9753-2870-4c77-aa6f-b15395c9db31.png b/sprites/spr_enemy3/layers/d8b82cf1-201c-46de-9adc-d1a180d8efc8/7b1f9753-2870-4c77-aa6f-b15395c9db31.png index c61b820..6819a82 100644 Binary files a/sprites/spr_enemy3/layers/d8b82cf1-201c-46de-9adc-d1a180d8efc8/7b1f9753-2870-4c77-aa6f-b15395c9db31.png and b/sprites/spr_enemy3/layers/d8b82cf1-201c-46de-9adc-d1a180d8efc8/7b1f9753-2870-4c77-aa6f-b15395c9db31.png differ diff --git a/sprites/spr_enemy4/4193522f-4978-4386-bb6c-1a68eda0722e.png b/sprites/spr_enemy4/4193522f-4978-4386-bb6c-1a68eda0722e.png new file mode 100644 index 0000000..3e39269 Binary files /dev/null and b/sprites/spr_enemy4/4193522f-4978-4386-bb6c-1a68eda0722e.png differ diff --git a/sprites/spr_enemy4/73acacdc-a11a-4794-932e-25e5ae726be9.png b/sprites/spr_enemy4/73acacdc-a11a-4794-932e-25e5ae726be9.png new file mode 100644 index 0000000..36846ea Binary files /dev/null and b/sprites/spr_enemy4/73acacdc-a11a-4794-932e-25e5ae726be9.png differ diff --git a/sprites/spr_enemy4/layers/4193522f-4978-4386-bb6c-1a68eda0722e/8b395234-df96-4590-9376-6d4908aee183.png b/sprites/spr_enemy4/layers/4193522f-4978-4386-bb6c-1a68eda0722e/8b395234-df96-4590-9376-6d4908aee183.png new file mode 100644 index 0000000..3e39269 Binary files /dev/null and b/sprites/spr_enemy4/layers/4193522f-4978-4386-bb6c-1a68eda0722e/8b395234-df96-4590-9376-6d4908aee183.png differ diff --git a/sprites/spr_enemy4/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png b/sprites/spr_enemy4/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png new file mode 100644 index 0000000..36846ea Binary files /dev/null and b/sprites/spr_enemy4/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png differ diff --git a/sprites/spr_enemy4/sp_enemy_3 (1)/sprite_flip_0.png b/sprites/spr_enemy4/sp_enemy_3 (1)/sprite_flip_0.png new file mode 100644 index 0000000..9871fd7 Binary files /dev/null and b/sprites/spr_enemy4/sp_enemy_3 (1)/sprite_flip_0.png differ diff --git a/sprites/spr_enemy4/sp_enemy_3 (1)/sprite_flip_1.png b/sprites/spr_enemy4/sp_enemy_3 (1)/sprite_flip_1.png new file mode 100644 index 0000000..f046e7b Binary files /dev/null and b/sprites/spr_enemy4/sp_enemy_3 (1)/sprite_flip_1.png differ diff --git a/sprites/spr_enemy4/spr_enemy4.yy b/sprites/spr_enemy4/spr_enemy4.yy new file mode 100644 index 0000000..a05079d --- /dev/null +++ b/sprites/spr_enemy4/spr_enemy4.yy @@ -0,0 +1,97 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_enemy4", + "bbox_bottom": 59, + "bbox_left": 7, + "bbox_right": 54, + "bbox_top": 4, + "bboxMode": 0, + "collisionKind": 5, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"73acacdc-a11a-4794-932e-25e5ae726be9",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7b1f9753-2870-4c77-aa6f-b15395c9db31","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": { + "resourceType": "GMNineSliceData", + "resourceVersion": "1.0", + "bottom": 0, + "enabled": false, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "left": 0, + "right": 0, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "top": 0, + }, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_enemy4", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"73acacdc-a11a-4794-932e-25e5ae726be9","path":"sprites/spr_enemy4/spr_enemy4.yy",},},},"Disabled":false,"id":"d6a1b9d2-a4f7-4625-bd2e-837c2947ebba","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 32, + "yorigin": 32, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/sprites/spr_enemy5/4193522f-4978-4386-bb6c-1a68eda0722e.png b/sprites/spr_enemy5/4193522f-4978-4386-bb6c-1a68eda0722e.png new file mode 100644 index 0000000..3e39269 Binary files /dev/null and b/sprites/spr_enemy5/4193522f-4978-4386-bb6c-1a68eda0722e.png differ diff --git a/sprites/spr_enemy5/73acacdc-a11a-4794-932e-25e5ae726be9.png b/sprites/spr_enemy5/73acacdc-a11a-4794-932e-25e5ae726be9.png new file mode 100644 index 0000000..81ab024 Binary files /dev/null and b/sprites/spr_enemy5/73acacdc-a11a-4794-932e-25e5ae726be9.png differ diff --git a/sprites/spr_enemy5/layers/4193522f-4978-4386-bb6c-1a68eda0722e/8b395234-df96-4590-9376-6d4908aee183.png b/sprites/spr_enemy5/layers/4193522f-4978-4386-bb6c-1a68eda0722e/8b395234-df96-4590-9376-6d4908aee183.png new file mode 100644 index 0000000..3e39269 Binary files /dev/null and b/sprites/spr_enemy5/layers/4193522f-4978-4386-bb6c-1a68eda0722e/8b395234-df96-4590-9376-6d4908aee183.png differ diff --git a/sprites/spr_enemy5/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png b/sprites/spr_enemy5/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png new file mode 100644 index 0000000..81ab024 Binary files /dev/null and b/sprites/spr_enemy5/layers/73acacdc-a11a-4794-932e-25e5ae726be9/7b1f9753-2870-4c77-aa6f-b15395c9db31.png differ diff --git a/sprites/spr_enemy5/sp_enemy_3 (1)/sprite_flip_0.png b/sprites/spr_enemy5/sp_enemy_3 (1)/sprite_flip_0.png new file mode 100644 index 0000000..9871fd7 Binary files /dev/null and b/sprites/spr_enemy5/sp_enemy_3 (1)/sprite_flip_0.png differ diff --git a/sprites/spr_enemy5/sp_enemy_3 (1)/sprite_flip_1.png b/sprites/spr_enemy5/sp_enemy_3 (1)/sprite_flip_1.png new file mode 100644 index 0000000..f046e7b Binary files /dev/null and b/sprites/spr_enemy5/sp_enemy_3 (1)/sprite_flip_1.png differ diff --git a/sprites/spr_enemy5/spr_enemy5.yy b/sprites/spr_enemy5/spr_enemy5.yy new file mode 100644 index 0000000..fbb2b18 --- /dev/null +++ b/sprites/spr_enemy5/spr_enemy5.yy @@ -0,0 +1,97 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_enemy5", + "bbox_bottom": 48, + "bbox_left": 12, + "bbox_right": 52, + "bbox_top": 16, + "bboxMode": 0, + "collisionKind": 5, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"73acacdc-a11a-4794-932e-25e5ae726be9",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"7b1f9753-2870-4c77-aa6f-b15395c9db31","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": { + "resourceType": "GMNineSliceData", + "resourceVersion": "1.0", + "bottom": 0, + "enabled": false, + "guideColour": [ + 4294902015, + 4294902015, + 4294902015, + 4294902015, + ], + "highlightColour": 1728023040, + "highlightStyle": 0, + "left": 0, + "right": 0, + "tileMode": [ + 0, + 0, + 0, + 0, + 0, + ], + "top": 0, + }, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_enemy5", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"73acacdc-a11a-4794-932e-25e5ae726be9","path":"sprites/spr_enemy5/spr_enemy5.yy",},},},"Disabled":false,"id":"dff07fb9-1d66-4044-9a0a-5e1b53d16e2f","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 32, + "yorigin": 32, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 64, +} \ No newline at end of file diff --git a/sprites/spr_enemyBullet1/6678b4db-83a4-4935-af65-c6e48a1895e5.png b/sprites/spr_enemyBullet1/6678b4db-83a4-4935-af65-c6e48a1895e5.png index cbbd128..9b4dd23 100644 Binary files a/sprites/spr_enemyBullet1/6678b4db-83a4-4935-af65-c6e48a1895e5.png and b/sprites/spr_enemyBullet1/6678b4db-83a4-4935-af65-c6e48a1895e5.png differ diff --git a/sprites/spr_enemyBullet1/layers/6678b4db-83a4-4935-af65-c6e48a1895e5/627c4bbd-ff96-4309-9e80-35f5e043db27.png b/sprites/spr_enemyBullet1/layers/6678b4db-83a4-4935-af65-c6e48a1895e5/627c4bbd-ff96-4309-9e80-35f5e043db27.png index cbbd128..9b4dd23 100644 Binary files a/sprites/spr_enemyBullet1/layers/6678b4db-83a4-4935-af65-c6e48a1895e5/627c4bbd-ff96-4309-9e80-35f5e043db27.png and b/sprites/spr_enemyBullet1/layers/6678b4db-83a4-4935-af65-c6e48a1895e5/627c4bbd-ff96-4309-9e80-35f5e043db27.png differ diff --git a/sprites/spr_enemyBullet3/0a063953-884e-4f76-9283-352758e4de27.png b/sprites/spr_enemyBullet3/0a063953-884e-4f76-9283-352758e4de27.png index e574ba0..d8cb29a 100644 Binary files a/sprites/spr_enemyBullet3/0a063953-884e-4f76-9283-352758e4de27.png and b/sprites/spr_enemyBullet3/0a063953-884e-4f76-9283-352758e4de27.png differ diff --git a/sprites/spr_enemyBullet3/layers/0a063953-884e-4f76-9283-352758e4de27/4a92a57e-078e-44e4-80f6-21468d5fb697.png b/sprites/spr_enemyBullet3/layers/0a063953-884e-4f76-9283-352758e4de27/4a92a57e-078e-44e4-80f6-21468d5fb697.png index e574ba0..d8cb29a 100644 Binary files a/sprites/spr_enemyBullet3/layers/0a063953-884e-4f76-9283-352758e4de27/4a92a57e-078e-44e4-80f6-21468d5fb697.png and b/sprites/spr_enemyBullet3/layers/0a063953-884e-4f76-9283-352758e4de27/4a92a57e-078e-44e4-80f6-21468d5fb697.png differ diff --git a/sprites/spr_explosion1/0a26c09a-c05b-467a-8d80-63cf5559b204.png b/sprites/spr_explosion1/0a26c09a-c05b-467a-8d80-63cf5559b204.png index 976cdc5..e97223f 100644 Binary files a/sprites/spr_explosion1/0a26c09a-c05b-467a-8d80-63cf5559b204.png and b/sprites/spr_explosion1/0a26c09a-c05b-467a-8d80-63cf5559b204.png differ diff --git a/sprites/spr_explosion1/204fa876-d128-43bc-85eb-6e74e0452cfa.png b/sprites/spr_explosion1/204fa876-d128-43bc-85eb-6e74e0452cfa.png index 57b8849..a090e4f 100644 Binary files a/sprites/spr_explosion1/204fa876-d128-43bc-85eb-6e74e0452cfa.png and b/sprites/spr_explosion1/204fa876-d128-43bc-85eb-6e74e0452cfa.png differ diff --git a/sprites/spr_explosion1/21868d7e-242c-4c21-973e-af201ecef588.png b/sprites/spr_explosion1/21868d7e-242c-4c21-973e-af201ecef588.png index 5486a16..b80b0e4 100644 Binary files a/sprites/spr_explosion1/21868d7e-242c-4c21-973e-af201ecef588.png and b/sprites/spr_explosion1/21868d7e-242c-4c21-973e-af201ecef588.png differ diff --git a/sprites/spr_explosion1/429565b8-7b1e-4365-be90-4f69d5b9b1a0.png b/sprites/spr_explosion1/429565b8-7b1e-4365-be90-4f69d5b9b1a0.png index 2c66854..975ccc0 100644 Binary files a/sprites/spr_explosion1/429565b8-7b1e-4365-be90-4f69d5b9b1a0.png and b/sprites/spr_explosion1/429565b8-7b1e-4365-be90-4f69d5b9b1a0.png differ diff --git a/sprites/spr_explosion1/6647b224-b4fe-422a-8aba-bbd27f74a8b7.png b/sprites/spr_explosion1/6647b224-b4fe-422a-8aba-bbd27f74a8b7.png index 90e65b2..309231b 100644 Binary files a/sprites/spr_explosion1/6647b224-b4fe-422a-8aba-bbd27f74a8b7.png and b/sprites/spr_explosion1/6647b224-b4fe-422a-8aba-bbd27f74a8b7.png differ diff --git a/sprites/spr_explosion1/a6966072-11d3-4908-90b8-e6a0684411c7.png b/sprites/spr_explosion1/a6966072-11d3-4908-90b8-e6a0684411c7.png index 811f683..88991ec 100644 Binary files a/sprites/spr_explosion1/a6966072-11d3-4908-90b8-e6a0684411c7.png and b/sprites/spr_explosion1/a6966072-11d3-4908-90b8-e6a0684411c7.png differ diff --git a/sprites/spr_explosion1/layers/0a26c09a-c05b-467a-8d80-63cf5559b204/54768b33-73b0-4edd-81a4-2701ca8a265b.png b/sprites/spr_explosion1/layers/0a26c09a-c05b-467a-8d80-63cf5559b204/54768b33-73b0-4edd-81a4-2701ca8a265b.png index 976cdc5..e97223f 100644 Binary files a/sprites/spr_explosion1/layers/0a26c09a-c05b-467a-8d80-63cf5559b204/54768b33-73b0-4edd-81a4-2701ca8a265b.png and b/sprites/spr_explosion1/layers/0a26c09a-c05b-467a-8d80-63cf5559b204/54768b33-73b0-4edd-81a4-2701ca8a265b.png differ diff --git a/sprites/spr_explosion1/layers/204fa876-d128-43bc-85eb-6e74e0452cfa/54768b33-73b0-4edd-81a4-2701ca8a265b.png b/sprites/spr_explosion1/layers/204fa876-d128-43bc-85eb-6e74e0452cfa/54768b33-73b0-4edd-81a4-2701ca8a265b.png index 57b8849..a090e4f 100644 Binary files a/sprites/spr_explosion1/layers/204fa876-d128-43bc-85eb-6e74e0452cfa/54768b33-73b0-4edd-81a4-2701ca8a265b.png and b/sprites/spr_explosion1/layers/204fa876-d128-43bc-85eb-6e74e0452cfa/54768b33-73b0-4edd-81a4-2701ca8a265b.png differ diff --git a/sprites/spr_explosion1/layers/21868d7e-242c-4c21-973e-af201ecef588/54768b33-73b0-4edd-81a4-2701ca8a265b.png b/sprites/spr_explosion1/layers/21868d7e-242c-4c21-973e-af201ecef588/54768b33-73b0-4edd-81a4-2701ca8a265b.png index 5486a16..b80b0e4 100644 Binary files a/sprites/spr_explosion1/layers/21868d7e-242c-4c21-973e-af201ecef588/54768b33-73b0-4edd-81a4-2701ca8a265b.png and b/sprites/spr_explosion1/layers/21868d7e-242c-4c21-973e-af201ecef588/54768b33-73b0-4edd-81a4-2701ca8a265b.png differ diff --git a/sprites/spr_explosion1/layers/429565b8-7b1e-4365-be90-4f69d5b9b1a0/54768b33-73b0-4edd-81a4-2701ca8a265b.png b/sprites/spr_explosion1/layers/429565b8-7b1e-4365-be90-4f69d5b9b1a0/54768b33-73b0-4edd-81a4-2701ca8a265b.png index 2c66854..975ccc0 100644 Binary files a/sprites/spr_explosion1/layers/429565b8-7b1e-4365-be90-4f69d5b9b1a0/54768b33-73b0-4edd-81a4-2701ca8a265b.png and b/sprites/spr_explosion1/layers/429565b8-7b1e-4365-be90-4f69d5b9b1a0/54768b33-73b0-4edd-81a4-2701ca8a265b.png differ diff --git a/sprites/spr_explosion1/layers/6647b224-b4fe-422a-8aba-bbd27f74a8b7/54768b33-73b0-4edd-81a4-2701ca8a265b.png b/sprites/spr_explosion1/layers/6647b224-b4fe-422a-8aba-bbd27f74a8b7/54768b33-73b0-4edd-81a4-2701ca8a265b.png index 90e65b2..309231b 100644 Binary files a/sprites/spr_explosion1/layers/6647b224-b4fe-422a-8aba-bbd27f74a8b7/54768b33-73b0-4edd-81a4-2701ca8a265b.png and b/sprites/spr_explosion1/layers/6647b224-b4fe-422a-8aba-bbd27f74a8b7/54768b33-73b0-4edd-81a4-2701ca8a265b.png differ diff --git a/sprites/spr_explosion1/layers/a6966072-11d3-4908-90b8-e6a0684411c7/54768b33-73b0-4edd-81a4-2701ca8a265b.png b/sprites/spr_explosion1/layers/a6966072-11d3-4908-90b8-e6a0684411c7/54768b33-73b0-4edd-81a4-2701ca8a265b.png index 811f683..88991ec 100644 Binary files a/sprites/spr_explosion1/layers/a6966072-11d3-4908-90b8-e6a0684411c7/54768b33-73b0-4edd-81a4-2701ca8a265b.png and b/sprites/spr_explosion1/layers/a6966072-11d3-4908-90b8-e6a0684411c7/54768b33-73b0-4edd-81a4-2701ca8a265b.png differ diff --git a/sprites/spr_glowPlayer/e336266d-f4ae-456c-8ef6-4e70a790e780.png b/sprites/spr_glowPlayer/e336266d-f4ae-456c-8ef6-4e70a790e780.png new file mode 100644 index 0000000..228b992 Binary files /dev/null and b/sprites/spr_glowPlayer/e336266d-f4ae-456c-8ef6-4e70a790e780.png differ diff --git a/sprites/spr_glowPlayer/layers/e336266d-f4ae-456c-8ef6-4e70a790e780/fa02f0a8-e365-4e70-88ae-ebffa29dd2b8.png b/sprites/spr_glowPlayer/layers/e336266d-f4ae-456c-8ef6-4e70a790e780/fa02f0a8-e365-4e70-88ae-ebffa29dd2b8.png new file mode 100644 index 0000000..626c9f8 Binary files /dev/null and b/sprites/spr_glowPlayer/layers/e336266d-f4ae-456c-8ef6-4e70a790e780/fa02f0a8-e365-4e70-88ae-ebffa29dd2b8.png differ diff --git a/sprites/spr_glowPlayer/spr_glowPlayer.yy b/sprites/spr_glowPlayer/spr_glowPlayer.yy new file mode 100644 index 0000000..a7fde51 --- /dev/null +++ b/sprites/spr_glowPlayer/spr_glowPlayer.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_glowPlayer", + "bbox_bottom": 1499, + "bbox_left": 0, + "bbox_right": 1499, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"e336266d-f4ae-456c-8ef6-4e70a790e780",}, + ], + "gridX": 0, + "gridY": 0, + "height": 1500, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"fa02f0a8-e365-4e70-88ae-ebffa29dd2b8","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_glowPlayer", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"e336266d-f4ae-456c-8ef6-4e70a790e780","path":"sprites/spr_glowPlayer/spr_glowPlayer.yy",},},},"Disabled":false,"id":"cda109bd-3fb6-455a-8a26-a934fbac9673","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 750, + "yorigin": 750, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 1500, +} \ No newline at end of file diff --git a/sprites/spr_ground/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f.png b/sprites/spr_ground/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f.png index efc6bae..603ac6f 100644 Binary files a/sprites/spr_ground/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f.png and b/sprites/spr_ground/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f.png differ diff --git a/sprites/spr_ground/layers/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f/971e2f35-64c3-4236-b6d0-492b7ca1d99f.png b/sprites/spr_ground/layers/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f/971e2f35-64c3-4236-b6d0-492b7ca1d99f.png index efc6bae..603ac6f 100644 Binary files a/sprites/spr_ground/layers/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f/971e2f35-64c3-4236-b6d0-492b7ca1d99f.png and b/sprites/spr_ground/layers/ef9b00d7-e07b-42cf-9a05-f7af8e7ba91f/971e2f35-64c3-4236-b6d0-492b7ca1d99f.png differ diff --git a/sprites/spr_healthPowerUp/ea20dfa1-5fe7-43b6-844b-208d1705cf3a.png b/sprites/spr_healthPowerUp/ea20dfa1-5fe7-43b6-844b-208d1705cf3a.png new file mode 100644 index 0000000..4b5550f Binary files /dev/null and b/sprites/spr_healthPowerUp/ea20dfa1-5fe7-43b6-844b-208d1705cf3a.png differ diff --git a/sprites/spr_healthPowerUp/layers/ea20dfa1-5fe7-43b6-844b-208d1705cf3a/bcded406-8e3c-40c1-9178-5b8472efbb1a.png b/sprites/spr_healthPowerUp/layers/ea20dfa1-5fe7-43b6-844b-208d1705cf3a/bcded406-8e3c-40c1-9178-5b8472efbb1a.png new file mode 100644 index 0000000..4b5550f Binary files /dev/null and b/sprites/spr_healthPowerUp/layers/ea20dfa1-5fe7-43b6-844b-208d1705cf3a/bcded406-8e3c-40c1-9178-5b8472efbb1a.png differ diff --git a/sprites/spr_healthPowerUp/spr_healthPowerUp.yy b/sprites/spr_healthPowerUp/spr_healthPowerUp.yy new file mode 100644 index 0000000..4416fc5 --- /dev/null +++ b/sprites/spr_healthPowerUp/spr_healthPowerUp.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_healthPowerUp", + "bbox_bottom": 157, + "bbox_left": 33, + "bbox_right": 125, + "bbox_top": 12, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"ea20dfa1-5fe7-43b6-844b-208d1705cf3a",}, + ], + "gridX": 0, + "gridY": 0, + "height": 177, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"bcded406-8e3c-40c1-9178-5b8472efbb1a","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_healthPowerUp", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": true, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"ea20dfa1-5fe7-43b6-844b-208d1705cf3a","path":"sprites/spr_healthPowerUp/spr_healthPowerUp.yy",},},},"Disabled":false,"id":"364de9a8-6590-4c16-8f8d-789d659b244c","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 82, + "yorigin": 88, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 165, +} \ No newline at end of file diff --git a/sprites/spr_miniBoss/51127b84-739f-4652-b7a8-14c1ff78078f.png b/sprites/spr_miniBoss/51127b84-739f-4652-b7a8-14c1ff78078f.png index d2a95ba..0611790 100644 Binary files a/sprites/spr_miniBoss/51127b84-739f-4652-b7a8-14c1ff78078f.png and b/sprites/spr_miniBoss/51127b84-739f-4652-b7a8-14c1ff78078f.png differ diff --git a/sprites/spr_miniBoss/51eb6752-89ad-4b6e-9eed-b192252d6c17.png b/sprites/spr_miniBoss/51eb6752-89ad-4b6e-9eed-b192252d6c17.png index d5b7a92..bf797b4 100644 Binary files a/sprites/spr_miniBoss/51eb6752-89ad-4b6e-9eed-b192252d6c17.png and b/sprites/spr_miniBoss/51eb6752-89ad-4b6e-9eed-b192252d6c17.png differ diff --git a/sprites/spr_miniBoss/layers/51127b84-739f-4652-b7a8-14c1ff78078f/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png b/sprites/spr_miniBoss/layers/51127b84-739f-4652-b7a8-14c1ff78078f/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png index d2a95ba..0611790 100644 Binary files a/sprites/spr_miniBoss/layers/51127b84-739f-4652-b7a8-14c1ff78078f/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png and b/sprites/spr_miniBoss/layers/51127b84-739f-4652-b7a8-14c1ff78078f/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png differ diff --git a/sprites/spr_miniBoss/layers/51eb6752-89ad-4b6e-9eed-b192252d6c17/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png b/sprites/spr_miniBoss/layers/51eb6752-89ad-4b6e-9eed-b192252d6c17/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png index d5b7a92..bf797b4 100644 Binary files a/sprites/spr_miniBoss/layers/51eb6752-89ad-4b6e-9eed-b192252d6c17/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png and b/sprites/spr_miniBoss/layers/51eb6752-89ad-4b6e-9eed-b192252d6c17/2a01783c-44c9-43b6-9ad3-ca375ae78c8f.png differ diff --git a/sprites/spr_player/4ec04ba3-307d-4fa3-b7d3-16c20581aa03.png b/sprites/spr_player/4ec04ba3-307d-4fa3-b7d3-16c20581aa03.png index fd46423..d31d042 100644 Binary files a/sprites/spr_player/4ec04ba3-307d-4fa3-b7d3-16c20581aa03.png and b/sprites/spr_player/4ec04ba3-307d-4fa3-b7d3-16c20581aa03.png differ diff --git a/sprites/spr_player/5a194ff4-ce98-4f58-8dfd-98af2e6f5571.png b/sprites/spr_player/5a194ff4-ce98-4f58-8dfd-98af2e6f5571.png index fa5837d..5a41ac7 100644 Binary files a/sprites/spr_player/5a194ff4-ce98-4f58-8dfd-98af2e6f5571.png and b/sprites/spr_player/5a194ff4-ce98-4f58-8dfd-98af2e6f5571.png differ diff --git a/sprites/spr_player/83ebe71c-71bd-4047-a2d8-0ae596e8c4b6.png b/sprites/spr_player/83ebe71c-71bd-4047-a2d8-0ae596e8c4b6.png index e7d3ace..ee6c539 100644 Binary files a/sprites/spr_player/83ebe71c-71bd-4047-a2d8-0ae596e8c4b6.png and b/sprites/spr_player/83ebe71c-71bd-4047-a2d8-0ae596e8c4b6.png differ diff --git a/sprites/spr_player/a5289a8a-4b30-4c24-b238-513c4dac5612.png b/sprites/spr_player/a5289a8a-4b30-4c24-b238-513c4dac5612.png index bb373f5..087df88 100644 Binary files a/sprites/spr_player/a5289a8a-4b30-4c24-b238-513c4dac5612.png and b/sprites/spr_player/a5289a8a-4b30-4c24-b238-513c4dac5612.png differ diff --git a/sprites/spr_player/spr_player.yy b/sprites/spr_player/spr_player.yy index 19ba678..36436d8 100644 --- a/sprites/spr_player/spr_player.yy +++ b/sprites/spr_player/spr_player.yy @@ -70,7 +70,7 @@ "eventStubScript": null, "eventToFunction": {}, "length": 4.0, - "lockOrigin": false, + "lockOrigin": true, "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, "playback": 1, "playbackSpeed": 30.0, diff --git a/sprites/spr_pressed/77ca82a3-76b8-49d3-b972-d43b5af71f08.png b/sprites/spr_pressed/77ca82a3-76b8-49d3-b972-d43b5af71f08.png new file mode 100644 index 0000000..e84778a Binary files /dev/null and b/sprites/spr_pressed/77ca82a3-76b8-49d3-b972-d43b5af71f08.png differ diff --git a/sprites/spr_pressed/layers/77ca82a3-76b8-49d3-b972-d43b5af71f08/656c2795-b1e9-49d4-b90a-0e3aaab307b9.png b/sprites/spr_pressed/layers/77ca82a3-76b8-49d3-b972-d43b5af71f08/656c2795-b1e9-49d4-b90a-0e3aaab307b9.png new file mode 100644 index 0000000..e84778a Binary files /dev/null and b/sprites/spr_pressed/layers/77ca82a3-76b8-49d3-b972-d43b5af71f08/656c2795-b1e9-49d4-b90a-0e3aaab307b9.png differ diff --git a/sprites/spr_pressed/spr_pressed.yy b/sprites/spr_pressed/spr_pressed.yy new file mode 100644 index 0000000..66c7fd1 --- /dev/null +++ b/sprites/spr_pressed/spr_pressed.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_pressed", + "bbox_bottom": 62, + "bbox_left": 1, + "bbox_right": 254, + "bbox_top": 1, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"77ca82a3-76b8-49d3-b972-d43b5af71f08",}, + ], + "gridX": 0, + "gridY": 0, + "height": 64, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"656c2795-b1e9-49d4-b90a-0e3aaab307b9","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 4, + "parent": { + "name": "Sprites", + "path": "folders/Sprites.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_pressed", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": true, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"77ca82a3-76b8-49d3-b972-d43b5af71f08","path":"sprites/spr_pressed/spr_pressed.yy",},},},"Disabled":false,"id":"89bb2ba9-4b76-47f8-8c78-4c33a163c879","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 128, + "yorigin": 32, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 256, +} \ No newline at end of file diff --git a/sprites/spr_rock_big/ba97ada6-6ce1-4513-ab64-50bc10a6f89f.png b/sprites/spr_rock_big/ba97ada6-6ce1-4513-ab64-50bc10a6f89f.png index 8d73ea0..e3222ad 100644 Binary files a/sprites/spr_rock_big/ba97ada6-6ce1-4513-ab64-50bc10a6f89f.png and b/sprites/spr_rock_big/ba97ada6-6ce1-4513-ab64-50bc10a6f89f.png differ diff --git a/sprites/spr_rock_big/layers/ba97ada6-6ce1-4513-ab64-50bc10a6f89f/9b5752e6-fbdf-4cb1-ad52-3d89f268674f.png b/sprites/spr_rock_big/layers/ba97ada6-6ce1-4513-ab64-50bc10a6f89f/9b5752e6-fbdf-4cb1-ad52-3d89f268674f.png index 8d73ea0..e3222ad 100644 Binary files a/sprites/spr_rock_big/layers/ba97ada6-6ce1-4513-ab64-50bc10a6f89f/9b5752e6-fbdf-4cb1-ad52-3d89f268674f.png and b/sprites/spr_rock_big/layers/ba97ada6-6ce1-4513-ab64-50bc10a6f89f/9b5752e6-fbdf-4cb1-ad52-3d89f268674f.png differ diff --git a/sprites/spr_rock_small/94f7aa5c-6586-413b-a342-47c26effec65.png b/sprites/spr_rock_small/94f7aa5c-6586-413b-a342-47c26effec65.png index a48d3dc..8e0da77 100644 Binary files a/sprites/spr_rock_small/94f7aa5c-6586-413b-a342-47c26effec65.png and b/sprites/spr_rock_small/94f7aa5c-6586-413b-a342-47c26effec65.png differ diff --git a/sprites/spr_rock_small/layers/94f7aa5c-6586-413b-a342-47c26effec65/1a8adc7e-99d5-4ee0-8b57-e4bc64dc6ecd.png b/sprites/spr_rock_small/layers/94f7aa5c-6586-413b-a342-47c26effec65/1a8adc7e-99d5-4ee0-8b57-e4bc64dc6ecd.png index a48d3dc..8e0da77 100644 Binary files a/sprites/spr_rock_small/layers/94f7aa5c-6586-413b-a342-47c26effec65/1a8adc7e-99d5-4ee0-8b57-e4bc64dc6ecd.png and b/sprites/spr_rock_small/layers/94f7aa5c-6586-413b-a342-47c26effec65/1a8adc7e-99d5-4ee0-8b57-e4bc64dc6ecd.png differ diff --git a/sprites/spr_rockbg/e38f331b-a608-4c55-807a-97b1bc52d85c.png b/sprites/spr_rockbg/e38f331b-a608-4c55-807a-97b1bc52d85c.png index 6fac9d6..0ec0070 100644 Binary files a/sprites/spr_rockbg/e38f331b-a608-4c55-807a-97b1bc52d85c.png and b/sprites/spr_rockbg/e38f331b-a608-4c55-807a-97b1bc52d85c.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1373a5c4-0cd5-4342-83a6-afb5ef0a74ee.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1373a5c4-0cd5-4342-83a6-afb5ef0a74ee.png index 4f3eedb..5df2384 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1373a5c4-0cd5-4342-83a6-afb5ef0a74ee.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1373a5c4-0cd5-4342-83a6-afb5ef0a74ee.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1a692713-1358-43cb-993c-1cf22db71182.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1a692713-1358-43cb-993c-1cf22db71182.png index b49e697..0363d35 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1a692713-1358-43cb-993c-1cf22db71182.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/1a692713-1358-43cb-993c-1cf22db71182.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/2e35ebaa-cf77-44e5-90bf-db5c30a51f27.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/2e35ebaa-cf77-44e5-90bf-db5c30a51f27.png index 4cf0e68..452ce48 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/2e35ebaa-cf77-44e5-90bf-db5c30a51f27.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/2e35ebaa-cf77-44e5-90bf-db5c30a51f27.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/3b074003-1a98-4b29-a9a5-ca7150f4f86c.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/3b074003-1a98-4b29-a9a5-ca7150f4f86c.png index 227906f..383e74a 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/3b074003-1a98-4b29-a9a5-ca7150f4f86c.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/3b074003-1a98-4b29-a9a5-ca7150f4f86c.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4027aa4f-48a2-4e85-95db-777f54db2a83.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4027aa4f-48a2-4e85-95db-777f54db2a83.png index 4cf0e68..452ce48 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4027aa4f-48a2-4e85-95db-777f54db2a83.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4027aa4f-48a2-4e85-95db-777f54db2a83.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/490621bc-e0ac-487d-a63e-8e50d2838384.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/490621bc-e0ac-487d-a63e-8e50d2838384.png index 626a9e0..fe3b8b6 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/490621bc-e0ac-487d-a63e-8e50d2838384.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/490621bc-e0ac-487d-a63e-8e50d2838384.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4c31a7c5-ebfd-470f-b250-b16f101ceb47.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4c31a7c5-ebfd-470f-b250-b16f101ceb47.png index b49e697..0363d35 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4c31a7c5-ebfd-470f-b250-b16f101ceb47.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/4c31a7c5-ebfd-470f-b250-b16f101ceb47.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/514b5d8b-8b89-4b3e-b0b2-241c523821ba.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/514b5d8b-8b89-4b3e-b0b2-241c523821ba.png index 227906f..383e74a 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/514b5d8b-8b89-4b3e-b0b2-241c523821ba.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/514b5d8b-8b89-4b3e-b0b2-241c523821ba.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7216d3a0-963c-49ba-996f-36f8da0227e2.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7216d3a0-963c-49ba-996f-36f8da0227e2.png index e9ed680..a10713a 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7216d3a0-963c-49ba-996f-36f8da0227e2.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7216d3a0-963c-49ba-996f-36f8da0227e2.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7fd08c41-9a64-402d-9b3a-2915a5378371.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7fd08c41-9a64-402d-9b3a-2915a5378371.png index 4f3eedb..5df2384 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7fd08c41-9a64-402d-9b3a-2915a5378371.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/7fd08c41-9a64-402d-9b3a-2915a5378371.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8b4168fc-2f09-43b9-bf02-6a874b71bfcc.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8b4168fc-2f09-43b9-bf02-6a874b71bfcc.png index a16e92b..4d1ec3e 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8b4168fc-2f09-43b9-bf02-6a874b71bfcc.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8b4168fc-2f09-43b9-bf02-6a874b71bfcc.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8cb4b489-5525-4149-8486-da844e902b2d.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8cb4b489-5525-4149-8486-da844e902b2d.png index 227906f..383e74a 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8cb4b489-5525-4149-8486-da844e902b2d.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8cb4b489-5525-4149-8486-da844e902b2d.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8f8352bb-8c75-469a-b6cf-f615cfb03eb9.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8f8352bb-8c75-469a-b6cf-f615cfb03eb9.png index a16e92b..4d1ec3e 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8f8352bb-8c75-469a-b6cf-f615cfb03eb9.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/8f8352bb-8c75-469a-b6cf-f615cfb03eb9.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/92250032-939e-43a9-8470-bf855e6b5978.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/92250032-939e-43a9-8470-bf855e6b5978.png index 4cf0e68..452ce48 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/92250032-939e-43a9-8470-bf855e6b5978.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/92250032-939e-43a9-8470-bf855e6b5978.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/982069a7-c963-4d95-9fbd-19baaced2e8a.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/982069a7-c963-4d95-9fbd-19baaced2e8a.png index 54c1b3b..85f2e72 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/982069a7-c963-4d95-9fbd-19baaced2e8a.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/982069a7-c963-4d95-9fbd-19baaced2e8a.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9e9ba5be-a65c-4500-884d-7db840d9e321.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9e9ba5be-a65c-4500-884d-7db840d9e321.png index badb02b..eeca044 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9e9ba5be-a65c-4500-884d-7db840d9e321.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9e9ba5be-a65c-4500-884d-7db840d9e321.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9f0dadc1-df82-4a13-9938-dfa0d2594443.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9f0dadc1-df82-4a13-9938-dfa0d2594443.png index 5fb46f5..2065e40 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9f0dadc1-df82-4a13-9938-dfa0d2594443.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/9f0dadc1-df82-4a13-9938-dfa0d2594443.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/a97af775-dcbf-40f9-9a7b-021aba7d5339.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/a97af775-dcbf-40f9-9a7b-021aba7d5339.png index 1f6cc2e..da28127 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/a97af775-dcbf-40f9-9a7b-021aba7d5339.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/a97af775-dcbf-40f9-9a7b-021aba7d5339.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bf52b5b7-2e3a-429b-801c-10c20f933809.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bf52b5b7-2e3a-429b-801c-10c20f933809.png index 4cf0e68..452ce48 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bf52b5b7-2e3a-429b-801c-10c20f933809.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bf52b5b7-2e3a-429b-801c-10c20f933809.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bfce7303-65b7-40e9-b144-4f7433f4ec65.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bfce7303-65b7-40e9-b144-4f7433f4ec65.png index 07412dd..4c35ee5 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bfce7303-65b7-40e9-b144-4f7433f4ec65.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/bfce7303-65b7-40e9-b144-4f7433f4ec65.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/c7e8ab32-1a59-471d-b124-0772246d4d15.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/c7e8ab32-1a59-471d-b124-0772246d4d15.png index dcda0ac..b5a391e 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/c7e8ab32-1a59-471d-b124-0772246d4d15.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/c7e8ab32-1a59-471d-b124-0772246d4d15.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e04e8a5c-7117-47e7-9709-d463273484bd.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e04e8a5c-7117-47e7-9709-d463273484bd.png index 4f3eedb..5df2384 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e04e8a5c-7117-47e7-9709-d463273484bd.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e04e8a5c-7117-47e7-9709-d463273484bd.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e24f0146-2bbf-4beb-a1ce-c258ffabbd33.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e24f0146-2bbf-4beb-a1ce-c258ffabbd33.png index 227906f..383e74a 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e24f0146-2bbf-4beb-a1ce-c258ffabbd33.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e24f0146-2bbf-4beb-a1ce-c258ffabbd33.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e34acfa3-b953-4cd5-88e7-7e4a7807a26f.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e34acfa3-b953-4cd5-88e7-7e4a7807a26f.png index 4d9dce1..df3df58 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e34acfa3-b953-4cd5-88e7-7e4a7807a26f.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e34acfa3-b953-4cd5-88e7-7e4a7807a26f.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e6ec4840-39a8-4994-8177-50d6fb6d1199.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e6ec4840-39a8-4994-8177-50d6fb6d1199.png index a42e2a9..27da74d 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e6ec4840-39a8-4994-8177-50d6fb6d1199.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/e6ec4840-39a8-4994-8177-50d6fb6d1199.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ebfddb07-35ea-4a17-bfda-20e65011d1fc.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ebfddb07-35ea-4a17-bfda-20e65011d1fc.png index ebf52b4..07795a5 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ebfddb07-35ea-4a17-bfda-20e65011d1fc.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ebfddb07-35ea-4a17-bfda-20e65011d1fc.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ee3ea997-1a68-4713-b4ae-c3d2a2a79e2d.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ee3ea997-1a68-4713-b4ae-c3d2a2a79e2d.png index b49e697..0363d35 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ee3ea997-1a68-4713-b4ae-c3d2a2a79e2d.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ee3ea997-1a68-4713-b4ae-c3d2a2a79e2d.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ef1de559-f598-4d69-aa61-b6b76f8e6dda.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ef1de559-f598-4d69-aa61-b6b76f8e6dda.png index a16e92b..4d1ec3e 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ef1de559-f598-4d69-aa61-b6b76f8e6dda.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/ef1de559-f598-4d69-aa61-b6b76f8e6dda.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/f7d4064f-9557-4a1b-8b8e-723d17fdfab5.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/f7d4064f-9557-4a1b-8b8e-723d17fdfab5.png index b49e697..0363d35 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/f7d4064f-9557-4a1b-8b8e-723d17fdfab5.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/f7d4064f-9557-4a1b-8b8e-723d17fdfab5.png differ diff --git a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/fb018e41-6be8-4b12-a890-bbd23f852477.png b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/fb018e41-6be8-4b12-a890-bbd23f852477.png index a16e92b..4d1ec3e 100644 Binary files a/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/fb018e41-6be8-4b12-a890-bbd23f852477.png and b/sprites/spr_rockbg/layers/e38f331b-a608-4c55-807a-97b1bc52d85c/fb018e41-6be8-4b12-a890-bbd23f852477.png differ diff --git a/sprites/spr_sky/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005.png b/sprites/spr_sky/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005.png index 239422d..6b1116d 100644 Binary files a/sprites/spr_sky/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005.png and b/sprites/spr_sky/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005.png differ diff --git a/sprites/spr_sky/layers/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005/e45aad84-f776-4949-8f0c-caf61d252fa5.png b/sprites/spr_sky/layers/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005/e45aad84-f776-4949-8f0c-caf61d252fa5.png index 239422d..a18d246 100644 Binary files a/sprites/spr_sky/layers/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005/e45aad84-f776-4949-8f0c-caf61d252fa5.png and b/sprites/spr_sky/layers/2c69ebb9-f0f9-42e6-a5f9-07d8e234c005/e45aad84-f776-4949-8f0c-caf61d252fa5.png differ diff --git a/sprites/spr_space/b1b9dcff-10d8-4604-9469-53a5502e05e7.png b/sprites/spr_space/b1b9dcff-10d8-4604-9469-53a5502e05e7.png index ef1f722..2e91fab 100644 Binary files a/sprites/spr_space/b1b9dcff-10d8-4604-9469-53a5502e05e7.png and b/sprites/spr_space/b1b9dcff-10d8-4604-9469-53a5502e05e7.png differ diff --git a/sprites/spr_space/layers/b1b9dcff-10d8-4604-9469-53a5502e05e7/fc3de0b7-b701-4b46-aad6-a96db3a22f79.png b/sprites/spr_space/layers/b1b9dcff-10d8-4604-9469-53a5502e05e7/fc3de0b7-b701-4b46-aad6-a96db3a22f79.png index ab4ebcc..4075ab3 100644 Binary files a/sprites/spr_space/layers/b1b9dcff-10d8-4604-9469-53a5502e05e7/fc3de0b7-b701-4b46-aad6-a96db3a22f79.png and b/sprites/spr_space/layers/b1b9dcff-10d8-4604-9469-53a5502e05e7/fc3de0b7-b701-4b46-aad6-a96db3a22f79.png differ diff --git a/sprites/spr_tempbackground/1a1b495e-536e-4e56-b252-990c6132ebd7.png b/sprites/spr_tempbackground/1a1b495e-536e-4e56-b252-990c6132ebd7.png new file mode 100644 index 0000000..738d68a Binary files /dev/null and b/sprites/spr_tempbackground/1a1b495e-536e-4e56-b252-990c6132ebd7.png differ diff --git a/sprites/spr_tempbackground/layers/1a1b495e-536e-4e56-b252-990c6132ebd7/c9297183-0b6c-45e7-845a-608e3c76665f.png b/sprites/spr_tempbackground/layers/1a1b495e-536e-4e56-b252-990c6132ebd7/c9297183-0b6c-45e7-845a-608e3c76665f.png new file mode 100644 index 0000000..738d68a Binary files /dev/null and b/sprites/spr_tempbackground/layers/1a1b495e-536e-4e56-b252-990c6132ebd7/c9297183-0b6c-45e7-845a-608e3c76665f.png differ diff --git a/sprites/spr_tempbackground/spr_tempbackground.yy b/sprites/spr_tempbackground/spr_tempbackground.yy new file mode 100644 index 0000000..b0c2f41 --- /dev/null +++ b/sprites/spr_tempbackground/spr_tempbackground.yy @@ -0,0 +1,74 @@ +{ + "resourceType": "GMSprite", + "resourceVersion": "1.0", + "name": "spr_tempbackground", + "bbox_bottom": 1079, + "bbox_left": 0, + "bbox_right": 1919, + "bbox_top": 0, + "bboxMode": 0, + "collisionKind": 1, + "collisionTolerance": 0, + "DynamicTexturePage": false, + "edgeFiltering": false, + "For3D": false, + "frames": [ + {"resourceType":"GMSpriteFrame","resourceVersion":"1.1","name":"1a1b495e-536e-4e56-b252-990c6132ebd7",}, + ], + "gridX": 0, + "gridY": 0, + "height": 1080, + "HTile": false, + "layers": [ + {"resourceType":"GMImageLayer","resourceVersion":"1.0","name":"c9297183-0b6c-45e7-845a-608e3c76665f","blendMode":0,"displayName":"default","isLocked":false,"opacity":100.0,"visible":true,}, + ], + "nineSlice": null, + "origin": 0, + "parent": { + "name": "Tile Sets", + "path": "folders/Tile Sets.yy", + }, + "preMultiplyAlpha": false, + "sequence": { + "resourceType": "GMSequence", + "resourceVersion": "1.4", + "name": "spr_tempbackground", + "autoRecord": true, + "backdropHeight": 768, + "backdropImageOpacity": 0.5, + "backdropImagePath": "", + "backdropWidth": 1366, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "events": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "eventStubScript": null, + "eventToFunction": {}, + "length": 1.0, + "lockOrigin": false, + "moments": {"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[],}, + "playback": 1, + "playbackSpeed": 30.0, + "playbackSpeedType": 0, + "showBackdrop": true, + "showBackdropImage": false, + "timeUnits": 1, + "tracks": [ + {"resourceType":"GMSpriteFramesTrack","resourceVersion":"1.0","name":"frames","builtinName":0,"events":[],"inheritsTrackColour":true,"interpolation":1,"isCreationTrack":false,"keyframes":{"resourceType":"KeyframeStore","resourceVersion":"1.0","Keyframes":[ + {"resourceType":"Keyframe","resourceVersion":"1.0","Channels":{"0":{"resourceType":"SpriteFrameKeyframe","resourceVersion":"1.0","Id":{"name":"1a1b495e-536e-4e56-b252-990c6132ebd7","path":"sprites/spr_tempbackground/spr_tempbackground.yy",},},},"Disabled":false,"id":"476f94ec-db72-4a57-937e-d0d278292bfa","IsCreationKey":false,"Key":0.0,"Length":1.0,"Stretch":false,}, + ],},"modifiers":[],"spriteId":null,"trackColour":0,"tracks":[],"traits":0,}, + ], + "visibleRange": null, + "volume": 1.0, + "xorigin": 0, + "yorigin": 0, + }, + "swatchColours": null, + "swfPrecision": 2.525, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "type": 0, + "VTile": false, + "width": 1920, +} \ No newline at end of file diff --git a/test.txt b/test.txt deleted file mode 100644 index d7e3416..0000000 --- a/test.txt +++ /dev/null @@ -1 +0,0 @@ -I put the bean in the soder. \ No newline at end of file diff --git a/tilesets/tileset_ground/output_tileset.png b/tilesets/tileset_ground/output_tileset.png index c31307f..7169c91 100644 Binary files a/tilesets/tileset_ground/output_tileset.png and b/tilesets/tileset_ground/output_tileset.png differ diff --git a/tilesets/tileset_underground/output_tileset.png b/tilesets/tileset_underground/output_tileset.png index e6b4941..9419cdd 100644 Binary files a/tilesets/tileset_underground/output_tileset.png and b/tilesets/tileset_underground/output_tileset.png differ