From afd14099f56abb9adbd98e73ca4a61b5ea51a262 Mon Sep 17 00:00:00 2001 From: magicalfeyfenny Date: Mon, 7 Jun 2021 04:52:09 -0400 Subject: [PATCH] Added debug UI, enemy destruction, and death/respawn logic --- thpj3/fonts/fn_GUI/fn_GUI.png | Bin 0 -> 10952 bytes thpj3/fonts/fn_GUI/fn_GUI.yy | 569 ++++++++++++++++++ .../Collision_obj_player_shot.gml | 5 + .../Collision_obj_wriggle.gml | 5 + thpj3/objects/obj_enemy_parent/Create_0.gml | 1 + thpj3/objects/obj_enemy_parent/Step_0.gml | 3 + .../obj_enemy_parent/obj_enemy_parent.yy | 36 ++ .../objects/obj_enemy_test/obj_enemy_test.yy | 37 ++ thpj3/objects/obj_wriggle/Create_0.gml | 5 +- thpj3/objects/obj_wriggle/Draw_0.gml | 25 +- thpj3/objects/obj_wriggle/Step_0.gml | 49 +- thpj3/options/linux/options_linux.yy | 2 +- thpj3/rooms/Room3/Room3.yy | 16 + .../scripts/scr_initialize/scr_initialize.gml | 5 + .../3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png | Bin 0 -> 567 bytes .../6318b594-701e-4090-a2bd-b4fdaf77fa8c.png | Bin 0 -> 544 bytes .../993217e7-fb50-46df-aacd-eb60145b908f.png | Bin 0 -> 536 bytes .../b4695467-7b63-4769-bb1c-d41f940fe2f3.png | Bin 0 -> 547 bytes .../fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png | Bin 0 -> 567 bytes .../fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png | Bin 0 -> 544 bytes .../fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png | Bin 0 -> 536 bytes .../fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png | Bin 0 -> 547 bytes thpj3/sprites/spr_fluff/spr_fluff.yy | 91 +++ thpj3/thpj3.yyp | 4 + 24 files changed, 845 insertions(+), 8 deletions(-) create mode 100644 thpj3/fonts/fn_GUI/fn_GUI.png create mode 100644 thpj3/fonts/fn_GUI/fn_GUI.yy create mode 100644 thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml create mode 100644 thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml create mode 100644 thpj3/objects/obj_enemy_parent/Create_0.gml create mode 100644 thpj3/objects/obj_enemy_parent/Step_0.gml create mode 100644 thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy create mode 100644 thpj3/objects/obj_enemy_test/obj_enemy_test.yy create mode 100644 thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png create mode 100644 thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png create mode 100644 thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png create mode 100644 thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png create mode 100644 thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png create mode 100644 thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png create mode 100644 thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png create mode 100644 thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png create mode 100644 thpj3/sprites/spr_fluff/spr_fluff.yy diff --git a/thpj3/fonts/fn_GUI/fn_GUI.png b/thpj3/fonts/fn_GUI/fn_GUI.png new file mode 100644 index 0000000000000000000000000000000000000000..5f163faeeff40426a7a5f1fc33ba82595f7ebfac GIT binary patch literal 10952 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 Os)`@fWb35O!~O>yA3I(E literal 0 HcmV?d00001 diff --git a/thpj3/fonts/fn_GUI/fn_GUI.yy b/thpj3/fonts/fn_GUI/fn_GUI.yy new file mode 100644 index 0000000..58d64a4 --- /dev/null +++ b/thpj3/fonts/fn_GUI/fn_GUI.yy @@ -0,0 +1,569 @@ +{ + "hinting": 0, + "glyphOperations": 0, + "interpreter": 0, + "pointRounding": 0, + "fontName": "Lato", + "styleName": "Regular", + "size": 12.0, + "bold": false, + "italic": false, + "charset": 0, + "AntiAlias": 1, + "first": 0, + "last": 0, + "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)", + "includeTTF": false, + "TTFName": "", + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "ascenderOffset": 0, + "glyphs": { + "32": {"x":2,"y":2,"w":4,"h":19,"character":32,"shift":4,"offset":0,}, + "33": {"x":154,"y":44,"w":3,"h":19,"character":33,"shift":4,"offset":1,}, + "34": {"x":148,"y":44,"w":4,"h":19,"character":34,"shift":6,"offset":1,}, + "35": {"x":137,"y":44,"w":9,"h":19,"character":35,"shift":9,"offset":0,}, + "36": {"x":126,"y":44,"w":9,"h":19,"character":36,"shift":9,"offset":0,}, + "37": {"x":111,"y":44,"w":13,"h":19,"character":37,"shift":13,"offset":0,}, + "38": {"x":97,"y":44,"w":12,"h":19,"character":38,"shift":11,"offset":0,}, + "39": {"x":93,"y":44,"w":2,"h":19,"character":39,"shift":3,"offset":1,}, + "40": {"x":87,"y":44,"w":4,"h":19,"character":40,"shift":4,"offset":0,}, + "41": {"x":81,"y":44,"w":4,"h":19,"character":41,"shift":4,"offset":0,}, + "42": {"x":159,"y":44,"w":6,"h":19,"character":42,"shift":7,"offset":0,}, + "43": {"x":70,"y":44,"w":9,"h":19,"character":43,"shift":9,"offset":0,}, + "44": {"x":54,"y":44,"w":3,"h":19,"character":44,"shift":4,"offset":0,}, + "45": {"x":48,"y":44,"w":4,"h":19,"character":45,"shift":6,"offset":1,}, + "46": {"x":43,"y":44,"w":3,"h":19,"character":46,"shift":4,"offset":0,}, + "47": {"x":34,"y":44,"w":7,"h":19,"character":47,"shift":7,"offset":0,}, + "48": {"x":23,"y":44,"w":9,"h":19,"character":48,"shift":9,"offset":0,}, + "49": {"x":13,"y":44,"w":8,"h":19,"character":49,"shift":9,"offset":1,}, + "50": {"x":2,"y":44,"w":9,"h":19,"character":50,"shift":9,"offset":0,}, + "51": {"x":241,"y":23,"w":9,"h":19,"character":51,"shift":9,"offset":0,}, + "52": {"x":230,"y":23,"w":9,"h":19,"character":52,"shift":9,"offset":0,}, + "53": {"x":59,"y":44,"w":9,"h":19,"character":53,"shift":9,"offset":0,}, + "54": {"x":167,"y":44,"w":9,"h":19,"character":54,"shift":9,"offset":0,}, + "55": {"x":178,"y":44,"w":9,"h":19,"character":55,"shift":9,"offset":0,}, + "56": {"x":189,"y":44,"w":9,"h":19,"character":56,"shift":9,"offset":0,}, + "57": {"x":158,"y":65,"w":9,"h":19,"character":57,"shift":9,"offset":0,}, + "58": {"x":154,"y":65,"w":2,"h":19,"character":58,"shift":4,"offset":1,}, + "59": {"x":149,"y":65,"w":3,"h":19,"character":59,"shift":4,"offset":1,}, + "60": {"x":140,"y":65,"w":7,"h":19,"character":60,"shift":9,"offset":1,}, + "61": {"x":130,"y":65,"w":8,"h":19,"character":61,"shift":9,"offset":1,}, + "62": {"x":121,"y":65,"w":7,"h":19,"character":62,"shift":9,"offset":1,}, + "63": {"x":112,"y":65,"w":7,"h":19,"character":63,"shift":7,"offset":0,}, + "64": {"x":97,"y":65,"w":13,"h":19,"character":64,"shift":13,"offset":0,}, + "65": {"x":84,"y":65,"w":11,"h":19,"character":65,"shift":11,"offset":0,}, + "66": {"x":73,"y":65,"w":9,"h":19,"character":66,"shift":10,"offset":1,}, + "67": {"x":60,"y":65,"w":11,"h":19,"character":67,"shift":11,"offset":0,}, + "68": {"x":47,"y":65,"w":11,"h":19,"character":68,"shift":12,"offset":1,}, + "69": {"x":37,"y":65,"w":8,"h":19,"character":69,"shift":9,"offset":1,}, + "70": {"x":27,"y":65,"w":8,"h":19,"character":70,"shift":9,"offset":1,}, + "71": {"x":14,"y":65,"w":11,"h":19,"character":71,"shift":12,"offset":0,}, + "72": {"x":2,"y":65,"w":10,"h":19,"character":72,"shift":12,"offset":1,}, + "73": {"x":244,"y":44,"w":3,"h":19,"character":73,"shift":4,"offset":1,}, + "74": {"x":236,"y":44,"w":6,"h":19,"character":74,"shift":7,"offset":0,}, + "75": {"x":224,"y":44,"w":10,"h":19,"character":75,"shift":11,"offset":1,}, + "76": {"x":215,"y":44,"w":7,"h":19,"character":76,"shift":8,"offset":1,}, + "77": {"x":200,"y":44,"w":13,"h":19,"character":77,"shift":15,"offset":1,}, + "78": {"x":218,"y":23,"w":10,"h":19,"character":78,"shift":12,"offset":1,}, + "79": {"x":203,"y":23,"w":13,"h":19,"character":79,"shift":13,"offset":0,}, + "80": {"x":192,"y":23,"w":9,"h":19,"character":80,"shift":10,"offset":1,}, + "81": {"x":225,"y":2,"w":13,"h":19,"character":81,"shift":13,"offset":0,}, + "82": {"x":208,"y":2,"w":9,"h":19,"character":82,"shift":10,"offset":1,}, + "83": {"x":198,"y":2,"w":8,"h":19,"character":83,"shift":9,"offset":0,}, + "84": {"x":186,"y":2,"w":10,"h":19,"character":84,"shift":9,"offset":0,}, + "85": {"x":174,"y":2,"w":10,"h":19,"character":85,"shift":12,"offset":1,}, + "86": {"x":161,"y":2,"w":11,"h":19,"character":86,"shift":11,"offset":0,}, + "87": {"x":142,"y":2,"w":17,"h":19,"character":87,"shift":17,"offset":0,}, + "88": {"x":129,"y":2,"w":11,"h":19,"character":88,"shift":10,"offset":0,}, + "89": {"x":117,"y":2,"w":10,"h":19,"character":89,"shift":10,"offset":0,}, + "90": {"x":105,"y":2,"w":10,"h":19,"character":90,"shift":10,"offset":0,}, + "91": {"x":219,"y":2,"w":4,"h":19,"character":91,"shift":5,"offset":1,}, + "92": {"x":96,"y":2,"w":7,"h":19,"character":92,"shift":7,"offset":0,}, + "93": {"x":82,"y":2,"w":4,"h":19,"character":93,"shift":5,"offset":0,}, + "94": {"x":72,"y":2,"w":8,"h":19,"character":94,"shift":9,"offset":1,}, + "95": {"x":63,"y":2,"w":7,"h":19,"character":95,"shift":7,"offset":0,}, + "96": {"x":57,"y":2,"w":4,"h":19,"character":96,"shift":6,"offset":1,}, + "97": {"x":48,"y":2,"w":7,"h":19,"character":97,"shift":8,"offset":0,}, + "98": {"x":38,"y":2,"w":8,"h":19,"character":98,"shift":9,"offset":1,}, + "99": {"x":28,"y":2,"w":8,"h":19,"character":99,"shift":8,"offset":0,}, + "100": {"x":18,"y":2,"w":8,"h":19,"character":100,"shift":9,"offset":0,}, + "101": {"x":8,"y":2,"w":8,"h":19,"character":101,"shift":8,"offset":0,}, + "102": {"x":88,"y":2,"w":6,"h":19,"character":102,"shift":6,"offset":0,}, + "103": {"x":240,"y":2,"w":8,"h":19,"character":103,"shift":8,"offset":0,}, + "104": {"x":85,"y":23,"w":7,"h":19,"character":104,"shift":9,"offset":1,}, + "105": {"x":250,"y":2,"w":3,"h":19,"character":105,"shift":4,"offset":0,}, + "106": {"x":177,"y":23,"w":4,"h":19,"character":106,"shift":4,"offset":-1,}, + "107": {"x":167,"y":23,"w":8,"h":19,"character":107,"shift":8,"offset":1,}, + "108": {"x":163,"y":23,"w":2,"h":19,"character":108,"shift":4,"offset":1,}, + "109": {"x":149,"y":23,"w":12,"h":19,"character":109,"shift":13,"offset":1,}, + "110": {"x":140,"y":23,"w":7,"h":19,"character":110,"shift":9,"offset":1,}, + "111": {"x":129,"y":23,"w":9,"h":19,"character":111,"shift":9,"offset":0,}, + "112": {"x":119,"y":23,"w":8,"h":19,"character":112,"shift":9,"offset":1,}, + "113": {"x":109,"y":23,"w":8,"h":19,"character":113,"shift":9,"offset":0,}, + "114": {"x":102,"y":23,"w":5,"h":19,"character":114,"shift":6,"offset":1,}, + "115": {"x":183,"y":23,"w":7,"h":19,"character":115,"shift":7,"offset":0,}, + "116": {"x":94,"y":23,"w":6,"h":19,"character":116,"shift":6,"offset":0,}, + "117": {"x":76,"y":23,"w":7,"h":19,"character":117,"shift":9,"offset":1,}, + "118": {"x":65,"y":23,"w":9,"h":19,"character":118,"shift":8,"offset":0,}, + "119": {"x":50,"y":23,"w":13,"h":19,"character":119,"shift":13,"offset":0,}, + "120": {"x":40,"y":23,"w":8,"h":19,"character":120,"shift":8,"offset":0,}, + "121": {"x":29,"y":23,"w":9,"h":19,"character":121,"shift":8,"offset":0,}, + "122": {"x":20,"y":23,"w":7,"h":19,"character":122,"shift":7,"offset":0,}, + "123": {"x":13,"y":23,"w":5,"h":19,"character":123,"shift":5,"offset":0,}, + "124": {"x":9,"y":23,"w":2,"h":19,"character":124,"shift":4,"offset":1,}, + "125": {"x":2,"y":23,"w":5,"h":19,"character":125,"shift":5,"offset":0,}, + "126": {"x":169,"y":65,"w":9,"h":19,"character":126,"shift":9,"offset":0,}, + "9647": {"x":180,"y":65,"w":7,"h":19,"character":9647,"shift":7,"offset":0,}, + }, + "kerningPairs": [ + {"first":34,"second":44,"amount":-1,}, + {"first":34,"second":46,"amount":-1,}, + {"first":34,"second":65,"amount":-1,}, + {"first":34,"second":74,"amount":-1,}, + {"first":34,"second":192,"amount":-1,}, + {"first":34,"second":193,"amount":-1,}, + {"first":34,"second":194,"amount":-1,}, + {"first":34,"second":195,"amount":-1,}, + {"first":34,"second":196,"amount":-1,}, + {"first":34,"second":197,"amount":-1,}, + {"first":34,"second":198,"amount":-1,}, + {"first":38,"second":84,"amount":-1,}, + {"first":38,"second":89,"amount":-1,}, + {"first":38,"second":221,"amount":-1,}, + {"first":39,"second":44,"amount":-1,}, + {"first":39,"second":46,"amount":-1,}, + {"first":39,"second":65,"amount":-1,}, + {"first":39,"second":74,"amount":-1,}, + {"first":39,"second":192,"amount":-1,}, + {"first":39,"second":193,"amount":-1,}, + {"first":39,"second":194,"amount":-1,}, + {"first":39,"second":195,"amount":-1,}, + {"first":39,"second":196,"amount":-1,}, + {"first":39,"second":197,"amount":-1,}, + {"first":39,"second":198,"amount":-1,}, + {"first":42,"second":65,"amount":-1,}, + {"first":42,"second":74,"amount":-1,}, + {"first":42,"second":192,"amount":-1,}, + {"first":42,"second":193,"amount":-1,}, + {"first":42,"second":194,"amount":-1,}, + {"first":42,"second":195,"amount":-1,}, + {"first":42,"second":196,"amount":-1,}, + {"first":42,"second":197,"amount":-1,}, + {"first":42,"second":198,"amount":-1,}, + {"first":44,"second":34,"amount":-1,}, + {"first":44,"second":39,"amount":-1,}, + {"first":44,"second":84,"amount":-1,}, + {"first":44,"second":86,"amount":-1,}, + {"first":44,"second":87,"amount":-1,}, + {"first":44,"second":89,"amount":-1,}, + {"first":44,"second":221,"amount":-1,}, + {"first":45,"second":74,"amount":-1,}, + {"first":45,"second":84,"amount":-1,}, + {"first":45,"second":89,"amount":-1,}, + {"first":45,"second":221,"amount":-1,}, + {"first":46,"second":34,"amount":-1,}, + {"first":46,"second":39,"amount":-1,}, + {"first":46,"second":84,"amount":-1,}, + {"first":46,"second":86,"amount":-1,}, + {"first":46,"second":87,"amount":-1,}, + {"first":46,"second":89,"amount":-1,}, + {"first":46,"second":221,"amount":-1,}, + {"first":47,"second":47,"amount":-2,}, + {"first":47,"second":65,"amount":-1,}, + {"first":47,"second":74,"amount":-1,}, + {"first":47,"second":192,"amount":-1,}, + {"first":47,"second":193,"amount":-1,}, + {"first":47,"second":194,"amount":-1,}, + {"first":47,"second":195,"amount":-1,}, + {"first":47,"second":196,"amount":-1,}, + {"first":47,"second":197,"amount":-1,}, + {"first":47,"second":198,"amount":-1,}, + {"first":58,"second":84,"amount":-1,}, + {"first":59,"second":84,"amount":-1,}, + {"first":65,"second":34,"amount":-1,}, + {"first":65,"second":39,"amount":-1,}, + {"first":65,"second":42,"amount":-1,}, + {"first":65,"second":84,"amount":-1,}, + {"first":65,"second":86,"amount":-1,}, + {"first":65,"second":89,"amount":-1,}, + {"first":65,"second":92,"amount":-1,}, + {"first":65,"second":186,"amount":-1,}, + {"first":65,"second":221,"amount":-1,}, + {"first":70,"second":44,"amount":-1,}, + {"first":70,"second":46,"amount":-1,}, + {"first":70,"second":65,"amount":-1,}, + {"first":70,"second":74,"amount":-1,}, + {"first":70,"second":97,"amount":-1,}, + {"first":70,"second":192,"amount":-1,}, + {"first":70,"second":193,"amount":-1,}, + {"first":70,"second":194,"amount":-1,}, + {"first":70,"second":195,"amount":-1,}, + {"first":70,"second":196,"amount":-1,}, + {"first":70,"second":197,"amount":-1,}, + {"first":70,"second":198,"amount":-1,}, + {"first":70,"second":224,"amount":-1,}, + {"first":70,"second":225,"amount":-1,}, + {"first":70,"second":226,"amount":-1,}, + {"first":70,"second":227,"amount":-1,}, + {"first":70,"second":228,"amount":-1,}, + {"first":70,"second":229,"amount":-1,}, + {"first":70,"second":230,"amount":-1,}, + {"first":70,"second":240,"amount":-1,}, + {"first":75,"second":118,"amount":-1,}, + {"first":75,"second":121,"amount":-1,}, + {"first":75,"second":253,"amount":-1,}, + {"first":76,"second":34,"amount":-1,}, + {"first":76,"second":39,"amount":-1,}, + {"first":76,"second":42,"amount":-1,}, + {"first":76,"second":45,"amount":-1,}, + {"first":76,"second":84,"amount":-1,}, + {"first":76,"second":86,"amount":-1,}, + {"first":76,"second":87,"amount":-1,}, + {"first":76,"second":89,"amount":-1,}, + {"first":76,"second":92,"amount":-1,}, + {"first":76,"second":118,"amount":-1,}, + {"first":76,"second":119,"amount":-1,}, + {"first":76,"second":121,"amount":-1,}, + {"first":76,"second":170,"amount":-1,}, + {"first":76,"second":173,"amount":-1,}, + {"first":76,"second":183,"amount":-1,}, + {"first":76,"second":186,"amount":-1,}, + {"first":76,"second":221,"amount":-1,}, + {"first":76,"second":253,"amount":-1,}, + {"first":76,"second":8208,"amount":-1,}, + {"first":76,"second":8729,"amount":-1,}, + {"first":80,"second":44,"amount":-1,}, + {"first":80,"second":46,"amount":-1,}, + {"first":80,"second":65,"amount":-1,}, + {"first":80,"second":74,"amount":-1,}, + {"first":80,"second":192,"amount":-1,}, + {"first":80,"second":193,"amount":-1,}, + {"first":80,"second":194,"amount":-1,}, + {"first":80,"second":195,"amount":-1,}, + {"first":80,"second":196,"amount":-1,}, + {"first":80,"second":197,"amount":-1,}, + {"first":80,"second":198,"amount":-1,}, + {"first":84,"second":44,"amount":-1,}, + {"first":84,"second":45,"amount":-1,}, + {"first":84,"second":46,"amount":-1,}, + {"first":84,"second":47,"amount":-1,}, + {"first":84,"second":58,"amount":-1,}, + {"first":84,"second":59,"amount":-1,}, + {"first":84,"second":65,"amount":-1,}, + {"first":84,"second":74,"amount":-1,}, + {"first":84,"second":97,"amount":-1,}, + {"first":84,"second":99,"amount":-1,}, + {"first":84,"second":100,"amount":-1,}, + {"first":84,"second":101,"amount":-1,}, + {"first":84,"second":102,"amount":-1,}, + {"first":84,"second":103,"amount":-1,}, + {"first":84,"second":109,"amount":-1,}, + {"first":84,"second":110,"amount":-1,}, + {"first":84,"second":111,"amount":-1,}, + {"first":84,"second":112,"amount":-1,}, + {"first":84,"second":113,"amount":-1,}, + {"first":84,"second":114,"amount":-1,}, + {"first":84,"second":115,"amount":-1,}, + {"first":84,"second":116,"amount":-1,}, + {"first":84,"second":117,"amount":-1,}, + {"first":84,"second":118,"amount":-1,}, + {"first":84,"second":119,"amount":-1,}, + {"first":84,"second":120,"amount":-1,}, + {"first":84,"second":121,"amount":-1,}, + {"first":84,"second":122,"amount":-1,}, + {"first":84,"second":171,"amount":-1,}, + {"first":84,"second":173,"amount":-1,}, + {"first":84,"second":187,"amount":-1,}, + {"first":84,"second":192,"amount":-1,}, + {"first":84,"second":193,"amount":-1,}, + {"first":84,"second":194,"amount":-1,}, + {"first":84,"second":195,"amount":-1,}, + {"first":84,"second":196,"amount":-1,}, + {"first":84,"second":197,"amount":-1,}, + {"first":84,"second":198,"amount":-1,}, + {"first":84,"second":223,"amount":-1,}, + {"first":84,"second":224,"amount":-1,}, + {"first":84,"second":225,"amount":-1,}, + {"first":84,"second":226,"amount":-1,}, + {"first":84,"second":227,"amount":-1,}, + {"first":84,"second":228,"amount":-1,}, + {"first":84,"second":229,"amount":-1,}, + {"first":84,"second":230,"amount":-1,}, + {"first":84,"second":231,"amount":-1,}, + {"first":84,"second":232,"amount":-1,}, + {"first":84,"second":233,"amount":-1,}, + {"first":84,"second":234,"amount":-1,}, + {"first":84,"second":235,"amount":-1,}, + {"first":84,"second":240,"amount":-1,}, + {"first":84,"second":241,"amount":-1,}, + {"first":84,"second":242,"amount":-1,}, + {"first":84,"second":243,"amount":-1,}, + {"first":84,"second":244,"amount":-1,}, + {"first":84,"second":245,"amount":-1,}, + {"first":84,"second":246,"amount":-1,}, + {"first":84,"second":248,"amount":-1,}, + {"first":84,"second":249,"amount":-1,}, + {"first":84,"second":250,"amount":-1,}, + {"first":84,"second":251,"amount":-1,}, + {"first":84,"second":252,"amount":-1,}, + {"first":84,"second":253,"amount":-1,}, + {"first":84,"second":8208,"amount":-1,}, + {"first":86,"second":44,"amount":-1,}, + {"first":86,"second":46,"amount":-1,}, + {"first":86,"second":47,"amount":-1,}, + {"first":86,"second":65,"amount":-1,}, + {"first":86,"second":74,"amount":-1,}, + {"first":86,"second":97,"amount":-1,}, + {"first":86,"second":99,"amount":-1,}, + {"first":86,"second":100,"amount":-1,}, + {"first":86,"second":101,"amount":-1,}, + {"first":86,"second":103,"amount":-1,}, + {"first":86,"second":109,"amount":-1,}, + {"first":86,"second":110,"amount":-1,}, + {"first":86,"second":111,"amount":-1,}, + {"first":86,"second":112,"amount":-1,}, + {"first":86,"second":113,"amount":-1,}, + {"first":86,"second":114,"amount":-1,}, + {"first":86,"second":115,"amount":-1,}, + {"first":86,"second":117,"amount":-1,}, + {"first":86,"second":171,"amount":-1,}, + {"first":86,"second":192,"amount":-1,}, + {"first":86,"second":193,"amount":-1,}, + {"first":86,"second":194,"amount":-1,}, + {"first":86,"second":195,"amount":-1,}, + {"first":86,"second":196,"amount":-1,}, + {"first":86,"second":197,"amount":-1,}, + {"first":86,"second":198,"amount":-1,}, + {"first":86,"second":224,"amount":-1,}, + {"first":86,"second":225,"amount":-1,}, + {"first":86,"second":226,"amount":-1,}, + {"first":86,"second":227,"amount":-1,}, + {"first":86,"second":228,"amount":-1,}, + {"first":86,"second":229,"amount":-1,}, + {"first":86,"second":230,"amount":-1,}, + {"first":86,"second":231,"amount":-1,}, + {"first":86,"second":232,"amount":-1,}, + {"first":86,"second":233,"amount":-1,}, + {"first":86,"second":234,"amount":-1,}, + {"first":86,"second":235,"amount":-1,}, + {"first":86,"second":240,"amount":-1,}, + {"first":86,"second":241,"amount":-1,}, + {"first":86,"second":242,"amount":-1,}, + {"first":86,"second":243,"amount":-1,}, + {"first":86,"second":244,"amount":-1,}, + {"first":86,"second":245,"amount":-1,}, + {"first":86,"second":246,"amount":-1,}, + {"first":86,"second":248,"amount":-1,}, + {"first":86,"second":249,"amount":-1,}, + {"first":86,"second":250,"amount":-1,}, + {"first":86,"second":251,"amount":-1,}, + {"first":86,"second":252,"amount":-1,}, + {"first":87,"second":44,"amount":-1,}, + {"first":87,"second":46,"amount":-1,}, + {"first":87,"second":74,"amount":-1,}, + {"first":87,"second":97,"amount":-1,}, + {"first":87,"second":99,"amount":-1,}, + {"first":87,"second":100,"amount":-1,}, + {"first":87,"second":101,"amount":-1,}, + {"first":87,"second":103,"amount":-1,}, + {"first":87,"second":111,"amount":-1,}, + {"first":87,"second":113,"amount":-1,}, + {"first":87,"second":115,"amount":-1,}, + {"first":87,"second":198,"amount":-1,}, + {"first":87,"second":224,"amount":-1,}, + {"first":87,"second":225,"amount":-1,}, + {"first":87,"second":226,"amount":-1,}, + {"first":87,"second":227,"amount":-1,}, + {"first":87,"second":228,"amount":-1,}, + {"first":87,"second":229,"amount":-1,}, + {"first":87,"second":230,"amount":-1,}, + {"first":87,"second":231,"amount":-1,}, + {"first":87,"second":232,"amount":-1,}, + {"first":87,"second":233,"amount":-1,}, + {"first":87,"second":234,"amount":-1,}, + {"first":87,"second":235,"amount":-1,}, + {"first":87,"second":240,"amount":-1,}, + {"first":87,"second":242,"amount":-1,}, + {"first":87,"second":243,"amount":-1,}, + {"first":87,"second":244,"amount":-1,}, + {"first":87,"second":245,"amount":-1,}, + {"first":87,"second":246,"amount":-1,}, + {"first":87,"second":248,"amount":-1,}, + {"first":89,"second":44,"amount":-1,}, + {"first":89,"second":45,"amount":-1,}, + {"first":89,"second":46,"amount":-1,}, + {"first":89,"second":47,"amount":-1,}, + {"first":89,"second":65,"amount":-1,}, + {"first":89,"second":74,"amount":-1,}, + {"first":89,"second":97,"amount":-1,}, + {"first":89,"second":99,"amount":-1,}, + {"first":89,"second":100,"amount":-1,}, + {"first":89,"second":101,"amount":-1,}, + {"first":89,"second":103,"amount":-1,}, + {"first":89,"second":109,"amount":-1,}, + {"first":89,"second":110,"amount":-1,}, + {"first":89,"second":111,"amount":-1,}, + {"first":89,"second":112,"amount":-1,}, + {"first":89,"second":113,"amount":-1,}, + {"first":89,"second":114,"amount":-1,}, + {"first":89,"second":115,"amount":-1,}, + {"first":89,"second":117,"amount":-1,}, + {"first":89,"second":118,"amount":-1,}, + {"first":89,"second":119,"amount":-1,}, + {"first":89,"second":120,"amount":-1,}, + {"first":89,"second":121,"amount":-1,}, + {"first":89,"second":122,"amount":-1,}, + {"first":89,"second":171,"amount":-1,}, + {"first":89,"second":173,"amount":-1,}, + {"first":89,"second":187,"amount":-1,}, + {"first":89,"second":192,"amount":-1,}, + {"first":89,"second":193,"amount":-1,}, + {"first":89,"second":194,"amount":-1,}, + {"first":89,"second":195,"amount":-1,}, + {"first":89,"second":196,"amount":-1,}, + {"first":89,"second":197,"amount":-1,}, + {"first":89,"second":198,"amount":-1,}, + {"first":89,"second":224,"amount":-1,}, + {"first":89,"second":225,"amount":-1,}, + {"first":89,"second":226,"amount":-1,}, + {"first":89,"second":227,"amount":-1,}, + {"first":89,"second":228,"amount":-1,}, + {"first":89,"second":229,"amount":-1,}, + {"first":89,"second":230,"amount":-1,}, + {"first":89,"second":231,"amount":-1,}, + {"first":89,"second":232,"amount":-1,}, + {"first":89,"second":233,"amount":-1,}, + {"first":89,"second":234,"amount":-1,}, + {"first":89,"second":235,"amount":-1,}, + {"first":89,"second":240,"amount":-1,}, + {"first":89,"second":241,"amount":-1,}, + {"first":89,"second":242,"amount":-1,}, + {"first":89,"second":243,"amount":-1,}, + {"first":89,"second":244,"amount":-1,}, + {"first":89,"second":245,"amount":-1,}, + {"first":89,"second":246,"amount":-1,}, + {"first":89,"second":248,"amount":-1,}, + {"first":89,"second":249,"amount":-1,}, + {"first":89,"second":250,"amount":-1,}, + {"first":89,"second":251,"amount":-1,}, + {"first":89,"second":252,"amount":-1,}, + {"first":89,"second":253,"amount":-1,}, + {"first":89,"second":8208,"amount":-1,}, + {"first":92,"second":34,"amount":-1,}, + {"first":92,"second":39,"amount":-1,}, + {"first":92,"second":84,"amount":-1,}, + {"first":92,"second":86,"amount":-1,}, + {"first":92,"second":89,"amount":-1,}, + {"first":92,"second":221,"amount":-1,}, + {"first":97,"second":84,"amount":-1,}, + {"first":97,"second":86,"amount":-1,}, + {"first":97,"second":89,"amount":-1,}, + {"first":97,"second":221,"amount":-1,}, + {"first":98,"second":84,"amount":-1,}, + {"first":98,"second":86,"amount":-1,}, + {"first":98,"second":87,"amount":-1,}, + {"first":98,"second":89,"amount":-1,}, + {"first":98,"second":221,"amount":-1,}, + {"first":99,"second":84,"amount":-1,}, + {"first":99,"second":86,"amount":-1,}, + {"first":99,"second":89,"amount":-1,}, + {"first":99,"second":221,"amount":-1,}, + {"first":101,"second":84,"amount":-1,}, + {"first":101,"second":86,"amount":-1,}, + {"first":101,"second":87,"amount":-1,}, + {"first":101,"second":89,"amount":-1,}, + {"first":101,"second":221,"amount":-1,}, + {"first":102,"second":74,"amount":-1,}, + {"first":103,"second":84,"amount":-1,}, + {"first":103,"second":89,"amount":-1,}, + {"first":103,"second":221,"amount":-1,}, + {"first":104,"second":84,"amount":-1,}, + {"first":104,"second":86,"amount":-1,}, + {"first":104,"second":89,"amount":-1,}, + {"first":104,"second":221,"amount":-1,}, + {"first":107,"second":84,"amount":-1,}, + {"first":107,"second":89,"amount":-1,}, + {"first":107,"second":221,"amount":-1,}, + {"first":109,"second":84,"amount":-1,}, + {"first":109,"second":86,"amount":-1,}, + {"first":109,"second":89,"amount":-1,}, + {"first":109,"second":221,"amount":-1,}, + {"first":110,"second":84,"amount":-1,}, + {"first":110,"second":86,"amount":-1,}, + {"first":110,"second":89,"amount":-1,}, + {"first":110,"second":221,"amount":-1,}, + {"first":111,"second":84,"amount":-1,}, + {"first":111,"second":86,"amount":-1,}, + {"first":111,"second":87,"amount":-1,}, + {"first":111,"second":89,"amount":-1,}, + {"first":111,"second":221,"amount":-1,}, + {"first":112,"second":84,"amount":-1,}, + {"first":112,"second":86,"amount":-1,}, + {"first":112,"second":87,"amount":-1,}, + {"first":112,"second":89,"amount":-1,}, + {"first":112,"second":221,"amount":-1,}, + {"first":113,"second":84,"amount":-1,}, + {"first":113,"second":86,"amount":-1,}, + {"first":113,"second":89,"amount":-1,}, + {"first":113,"second":221,"amount":-1,}, + {"first":114,"second":65,"amount":-1,}, + {"first":114,"second":74,"amount":-1,}, + {"first":114,"second":84,"amount":-1,}, + {"first":114,"second":88,"amount":-1,}, + {"first":114,"second":89,"amount":-1,}, + {"first":114,"second":192,"amount":-1,}, + {"first":114,"second":193,"amount":-1,}, + {"first":114,"second":194,"amount":-1,}, + {"first":114,"second":195,"amount":-1,}, + {"first":114,"second":196,"amount":-1,}, + {"first":114,"second":197,"amount":-1,}, + {"first":114,"second":221,"amount":-1,}, + {"first":115,"second":84,"amount":-1,}, + {"first":115,"second":86,"amount":-1,}, + {"first":115,"second":89,"amount":-1,}, + {"first":115,"second":221,"amount":-1,}, + {"first":116,"second":84,"amount":-1,}, + {"first":116,"second":89,"amount":-1,}, + {"first":116,"second":221,"amount":-1,}, + {"first":117,"second":84,"amount":-1,}, + {"first":117,"second":86,"amount":-1,}, + {"first":117,"second":89,"amount":-1,}, + {"first":117,"second":221,"amount":-1,}, + {"first":118,"second":74,"amount":-1,}, + {"first":118,"second":84,"amount":-1,}, + {"first":118,"second":89,"amount":-1,}, + {"first":118,"second":221,"amount":-1,}, + {"first":119,"second":74,"amount":-1,}, + {"first":119,"second":84,"amount":-1,}, + {"first":119,"second":89,"amount":-1,}, + {"first":119,"second":221,"amount":-1,}, + {"first":120,"second":84,"amount":-1,}, + {"first":120,"second":89,"amount":-1,}, + {"first":120,"second":221,"amount":-1,}, + {"first":121,"second":74,"amount":-1,}, + {"first":121,"second":84,"amount":-1,}, + {"first":121,"second":89,"amount":-1,}, + {"first":121,"second":221,"amount":-1,}, + {"first":122,"second":84,"amount":-1,}, + {"first":122,"second":89,"amount":-1,}, + {"first":122,"second":221,"amount":-1,}, + ], + "ranges": [ + {"lower":32,"upper":127,}, + {"lower":9647,"upper":9647,}, + ], + "regenerateBitmap": false, + "canGenerateBitmap": true, + "maintainGms1Font": false, + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "fn_GUI", + "tags": [], + "resourceType": "GMFont", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml b/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml new file mode 100644 index 0000000..083a6fa --- /dev/null +++ b/thpj3/objects/obj_enemy_parent/Collision_obj_player_shot.gml @@ -0,0 +1,5 @@ +hp -= other.damage; + +with (other) { + instance_destroy(); +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml b/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml new file mode 100644 index 0000000..efe385a --- /dev/null +++ b/thpj3/objects/obj_enemy_parent/Collision_obj_wriggle.gml @@ -0,0 +1,5 @@ +if (!other.invuln) { + with (other) { + emergency = 15; + } +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Create_0.gml b/thpj3/objects/obj_enemy_parent/Create_0.gml new file mode 100644 index 0000000..137f114 --- /dev/null +++ b/thpj3/objects/obj_enemy_parent/Create_0.gml @@ -0,0 +1 @@ +hp = 10; \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/Step_0.gml b/thpj3/objects/obj_enemy_parent/Step_0.gml new file mode 100644 index 0000000..0440f7b --- /dev/null +++ b/thpj3/objects/obj_enemy_parent/Step_0.gml @@ -0,0 +1,3 @@ +if ( hp <= 0 ) { + instance_destroy(); +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy b/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy new file mode 100644 index 0000000..b96d180 --- /dev/null +++ b/thpj3/objects/obj_enemy_parent/obj_enemy_parent.yy @@ -0,0 +1,36 @@ +{ + "spriteId": null, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": null, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [ + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"obj_player_shot","path":"objects/obj_player_shot/obj_player_shot.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":3,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":4,"collisionObjectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + ], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_parent", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_enemy_test/obj_enemy_test.yy b/thpj3/objects/obj_enemy_test/obj_enemy_test.yy new file mode 100644 index 0000000..fde9726 --- /dev/null +++ b/thpj3/objects/obj_enemy_test/obj_enemy_test.yy @@ -0,0 +1,37 @@ +{ + "spriteId": { + "name": "spr_fluff", + "path": "sprites/spr_fluff/spr_fluff.yy", + }, + "solid": false, + "visible": true, + "spriteMaskId": null, + "persistent": false, + "parentObjectId": { + "name": "obj_enemy_parent", + "path": "objects/obj_enemy_parent/obj_enemy_parent.yy", + }, + "physicsObject": false, + "physicsSensor": false, + "physicsShape": 1, + "physicsGroup": 1, + "physicsDensity": 0.5, + "physicsRestitution": 0.1, + "physicsLinearDamping": 0.1, + "physicsAngularDamping": 0.1, + "physicsFriction": 0.2, + "physicsStartAwake": true, + "physicsKinematic": false, + "physicsShapePoints": [], + "eventList": [], + "properties": [], + "overriddenProperties": [], + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "obj_enemy_test", + "tags": [], + "resourceType": "GMObject", +} \ No newline at end of file diff --git a/thpj3/objects/obj_wriggle/Create_0.gml b/thpj3/objects/obj_wriggle/Create_0.gml index c18a8c5..bcdf21f 100644 --- a/thpj3/objects/obj_wriggle/Create_0.gml +++ b/thpj3/objects/obj_wriggle/Create_0.gml @@ -6,7 +6,8 @@ face_dir = RIGHT; hitbox_rotator = 0; bombing = 0; -invuln = 0; +invuln = false; +respawn = 0; recovery = 0; emergency = 0; hyper_time = 0; @@ -14,6 +15,8 @@ hyper_tier = 0; h_move = 0; v_move = 0; shoot_delay = 0; +x = SPAWN_X; +y = SPAWN_Y; top_option = instance_create_layer(x,y,"Instances", obj_options); with (top_option) { diff --git a/thpj3/objects/obj_wriggle/Draw_0.gml b/thpj3/objects/obj_wriggle/Draw_0.gml index 6ba24d0..1e06afc 100644 --- a/thpj3/objects/obj_wriggle/Draw_0.gml +++ b/thpj3/objects/obj_wriggle/Draw_0.gml @@ -1,4 +1,25 @@ -draw_sprite_ext( spr_wriggle, image_index, x, y, face_dir, 1, 0, c_white, 1 * ( max( 1, recovery ) % 3 ) ); +if (!respawn) { + draw_sprite_ext( spr_wriggle, image_index, x, y, face_dir, 1, 0, c_white, 1 * ( max( 1, recovery ) % 3 ) ); +} draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 2, 2, hitbox_rotator, c_white, .75); -draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 1, 1, -hitbox_rotator, c_white, 1); \ No newline at end of file +draw_sprite_ext( spr_wriggle_hitbox, 0, x, y, 1, 1, -hitbox_rotator, c_white, 1); + +draw_set_font( fn_GUI ); +draw_text( 20, 690, input_left ); +draw_text( 50, 690, input_right ); +draw_text( 35, 680, input_up ); +draw_text( 35, 700, input_down ); +draw_text( 70, 690, input_focus ); +draw_text( 80, 690, input_shot_left ); +draw_text( 90, 690, input_bomb ); +draw_text( 100, 690, input_shot_right ); +draw_text( 1000, 600, "bomb timer: " + string(bombing) ); +draw_text( 1000, 620, "hyper timer: " + string(hyper_time) + " / " + string(hyper_tier) ); +draw_text( 1000, 640, "emergency timer: " + string(emergency) ); +draw_text( 1000, 660, "death recovery: " + string(recovery) + " / " + string(respawn) ); +draw_text( 1000, 10, "dialogue state: " + string(obj_dialogue.dialogue_mode) ); +draw_text( 1000, 30, "invulnerable state: " + string(invuln) ); +draw_text( 20, 10, "lives: " + string(lives_current) + " / " + string(LIVES_MAX) ); +draw_text( 20, 30, "bombs: " + string(bombs_current) + " / " + string(BOMBS_MAX) ); +draw_text( 20, 50, "hyper: " + string(hyper_current) + " / " + string(HYPER_MAX) + " / req: " + string(HYPER_COST) ); diff --git a/thpj3/objects/obj_wriggle/Step_0.gml b/thpj3/objects/obj_wriggle/Step_0.gml index e643fbd..8b56e5d 100644 --- a/thpj3/objects/obj_wriggle/Step_0.gml +++ b/thpj3/objects/obj_wriggle/Step_0.gml @@ -1,12 +1,13 @@ hitbox_rotator++; bombing--; -invuln--; recovery--; +respawn--; emergency--; hyper_time--; shoot_delay--; h_move = 0; v_move = 0; +hyper_current += .02; input_up = keyboard_check( vk_up ); input_down = keyboard_check( vk_down ); @@ -17,12 +18,38 @@ input_shot_right = keyboard_check( ord( "C" ) ); input_focus = keyboard_check( vk_shift ); input_bomb = keyboard_check_pressed( ord("X") ); +//limiters and resets if ( hyper_time <= 0 ) { hyper_tier = HYPER_INACTIVE; } +if ( lives_current > LIVES_MAX ) { + lives_current = LIVES_MAX; +} +if ( bombs_current > BOMBS_MAX ) { + bombs_current = BOMBS_MAX; +} +if ( hyper_current > HYPER_MAX ) { + hyper_current = HYPER_MAX; +} +if ( emergency == 0 ) { + lives_current -= 1; + respawn = RESPAWN_TIMER; + x = SPAWN_X; + y = SPAWN_Y; +} +if ( respawn == 0 ) { + recovery = RESPAWN_INVULN; +} + +//invuln logic +if ( bombing || recovery || emergency || respawn || obj_dialogue.dialogue_mode ) { + invuln = true; +} else { + invuln = false; +} //bomb logic -if ( input_bomb && !bombing && !recovery) { +if ( input_bomb && !bombing && !recovery && !respawn ) { //death bomb if ( emergency ) { if ( hyper_current >= HYPER_COST && hyper_tier == HYPER_INACTIVE ) { @@ -31,10 +58,15 @@ if ( input_bomb && !bombing && !recovery) { invuln = 60; hyper_time = 420; hyper_tier = HYPER_TIER_3; + emergency = -5; } else if (bombs_current > 0 ) { bombs_current = 0; //costs all bombs bombing = 300; invuln = 360; + emergency = -5; + if (hyper_time > 0) { + hyper_time = 0; + } //TODO: create death bomb object //instance_create } @@ -52,6 +84,9 @@ if ( input_bomb && !bombing && !recovery) { bombs_current -= 1; //costs 1 bomb bombing = 180; invuln = 180; + if (hyper_time > 0) { + hyper_time = 0; + } //TODO: create bomb object //instance_create } @@ -59,7 +94,7 @@ if ( input_bomb && !bombing && !recovery) { } //movement logic -if ( !emergency && !recovery ) { +if ( !emergency && !respawn ) { //convert input bools to directions if ( input_up ) { v_move--; @@ -99,7 +134,7 @@ if ( !emergency && !recovery ) { } //shot and facing logic -if ( !emergency && !recovery ) { +if ( !emergency && !respawn ) { //change directions if only one is held if ( input_shot_left && !input_shot_right ) { face_dir = LEFT; @@ -146,4 +181,10 @@ if ( !emergency && !recovery ) { } } } +} + +//death logic +if ( lives_current == 0 ) { +//TODO: add score and continue logic + room_goto(rm_title); } \ No newline at end of file diff --git a/thpj3/options/linux/options_linux.yy b/thpj3/options/linux/options_linux.yy index 5f0c97c..35650d8 100644 --- a/thpj3/options/linux/options_linux.yy +++ b/thpj3/options/linux/options_linux.yy @@ -1,5 +1,5 @@ { - "option_linux_display_name": "wriggle's imperishable night [preview]", + "option_linux_display_name": "wriggle's unwriggleable night [preview]", "option_linux_version": "1.0.0.0", "option_linux_maintainer_email": "jmhogueison@outlook.com", "option_linux_homepage": "https://git.fenny.space/magicalfeyfenny/touhou-pride-jam-2021", diff --git a/thpj3/rooms/Room3/Room3.yy b/thpj3/rooms/Room3/Room3.yy index 65e4295..265464c 100644 --- a/thpj3/rooms/Room3/Room3.yy +++ b/thpj3/rooms/Room3/Room3.yy @@ -16,6 +16,14 @@ {"instances":[ {"properties":[],"isDnd":false,"objectId":{"name":"obj_dialogue","path":"objects/obj_dialogue/obj_dialogue.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":448.0,"resourceVersion":"1.0","name":"inst_1ED821BC","tags":[],"resourceType":"GMRInstance",}, {"properties":[],"isDnd":false,"objectId":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":128.0,"resourceVersion":"1.0","name":"inst_61D7FC1F","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":832.0,"y":96.0,"resourceVersion":"1.0","name":"inst_46D8A64E","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":768.0,"y":256.0,"resourceVersion":"1.0","name":"inst_54357CBC","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":960.0,"y":320.0,"resourceVersion":"1.0","name":"inst_1743B867","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":1056.0,"y":160.0,"resourceVersion":"1.0","name":"inst_30573D51","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":736.0,"y":512.0,"resourceVersion":"1.0","name":"inst_3ED0F16","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":960.0,"y":608.0,"resourceVersion":"1.0","name":"inst_785FEC2","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":864.0,"y":448.0,"resourceVersion":"1.0","name":"inst_4AFCD551","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":704.0,"y":640.0,"resourceVersion":"1.0","name":"inst_562A4B4B","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"spriteId":null,"colour":4278190080,"x":0,"y":0,"htiled":false,"vtiled":false,"hspeed":0.0,"vspeed":0.0,"stretch":false,"animationFPS":15.0,"animationSpeedType":0,"userdefinedAnimFPS":false,"visible":true,"depth":100,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Background","tags":[],"resourceType":"GMRBackgroundLayer",}, ], @@ -25,6 +33,14 @@ "instanceCreationOrder": [ {"name":"inst_1ED821BC","path":"rooms/Room3/Room3.yy",}, {"name":"inst_61D7FC1F","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_46D8A64E","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_54357CBC","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_1743B867","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_30573D51","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_3ED0F16","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_785FEC2","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_4AFCD551","path":"rooms/Room3/Room3.yy",}, + {"name":"inst_562A4B4B","path":"rooms/Room3/Room3.yy",}, ], "inheritCreationOrder": false, "sequenceId": null, diff --git a/thpj3/scripts/scr_initialize/scr_initialize.gml b/thpj3/scripts/scr_initialize/scr_initialize.gml index f7e8fea..0b29508 100644 --- a/thpj3/scripts/scr_initialize/scr_initialize.gml +++ b/thpj3/scripts/scr_initialize/scr_initialize.gml @@ -17,6 +17,8 @@ #macro BOUNDARY_RIGHT 1248 #macro BOUNDARY_TOP 32 #macro BOUNDARY_BOTTOM 688 +#macro SPAWN_X 120 +#macro SPAWN_Y 360 #macro LEFT -1 #macro RIGHT 1 @@ -29,6 +31,9 @@ #macro HYPER_INIT 0 #macro HYPER_COST 100 #macro HYPER_MAX 300 +#macro DEATHBOMB_WINDOW 15 +#macro RESPAWN_TIMER 60 +#macro RESPAWN_INVULN 120 #macro FOCUS_SPEED 2 #macro UNFOC_SPEED 5 diff --git a/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png b/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png new file mode 100644 index 0000000000000000000000000000000000000000..d7e4aa0a32f386247a29a7cb7171041b99183584 GIT binary patch literal 567 zcmV-70?7S|P)Z8<-AP`Gwv7oiImYe54Qkn|Nf+oQz8a*5nR{xwr!jE_as{wS^zE6IDqJJ!APCj6(Hi^(vukd zoIb~4QJ~=+P(=6?3vLva!X?&=)vUq_fOLN6M6#Gw;I}{zBW{>N075Imn*b=5*P;>O zCBWH}*D}o(C`euK5+I}MYg?ctZw^3eeZ9E74?xFl57g^&HIv;SO978*?s*b41~Kr2(%8%_CNWZ66N?SZ0jG=6go3o(@faWUzdH}-jlkocI ziRW)a1&9MjVJ<)jGR-VQ@PeBIB;X*zRq)>S7fc1n1&E0yi6KQ=q2GYoaB1vjC;wW^{sj5u7ReLRNsQ?u`NMF%=z<3c3~!OMl_}>v=fXoTSA^GJv-uxjzYBxw4&jHx6RNUUGV0BRrUcbT>dv0 zzefvVIi9K-fOJM~j=Ob&ci<~P?Stq#UplAD4XyzVHP34os4wYWQ=CbOP5R9yvNyn5><0AuiisQ}&utp{@l iFb6Nt^Z_VtFTfwTK`iH2%W=H`0000>;7 z3U?0B$Vd;Z&k>h^g$V99K@0n95n>Y5blI=~tZZww!VnH9K~In21Smn2#y|K7}_t$Y8r`PIWXV)0A1X`J%btzSVR%TnI_muBNw#ASRNT5WZ3Q%Wu6qPQJ z9?0JGMvx9jVM_o-7y<6eWY!5y0iu;b$>_d7cfjlhh@vY%WEYG;cK`}#7g!3_1q8rzku~!A5SzV!Tj?IVqES4D~R!U z6GU%5UZ8gY_9jdhAi;DORDjWJ)~&4d_u98ph6LyZS1wX&Y3q^@JD_)410jON-6W9! zR|~uo;Vw9;)B^429j9+{yP}`c!SSAVV?cM@V|ogm2R{B{uIN3DNjQZ0-D1gFpF5z2rZsfY+`03i_(Hv?)F zJ@Pi!V<-a92bc3akL$XcW4I}CGoaPCTkZEVtS$sSfv3Hcmzo0KNq+G(ufwp zNa3$~8uW^ICm2b*6rpQ?#CgE20ksB6W5@VsfQNlQ7oH2I_iJtQY7|ueA(Af4y(pI? zzP8d@{eqhmXo>H!5(RDyAP`-l8v{@+an%5HA+%&SLg~dfiYMIE02ChsJTyT)@~uv4 zuD4FGHprtfreBYjH}hx+mt6zU6DYAhi?}i%Pc^He?8<-^Zk`eweWZ1E^;!ZoAIz9G z;3+htK1Q>g0#Cwca#-RTTv!H3u6FNQ+K~kZ8<-AP`Gwv7oiImYe54Qkn|Nf+oQz8a*5nR{xwr!jE_as{wS^zE6IDqJJ!APCj6(Hi^(vukd zoIb~4QJ~=+P(=6?3vLva!X?&=)vUq_fOLN6M6#Gw;I}{zBW{>N075Imn*b=5*P;>O zCBWH}*D}o(C`euK5+I}MYg?ctZw^3eeZ9E74?xFl57g^&HIv;SO978*?s*b41~Kr2(%8%_CNWZ66N?SZ0jG=6go3o(@faWUzdH}-jlkocI ziRW)a1&9MjVJ<)jGR-VQ@PeBIB;X*zRq)>S7fc1n1&E0yi6KQ=q2GYoaB1vjC;wW^{sj5u7ReLRNsQ?u`NMF%=z<3c3~!OMl_}>v=fXoTSA^GJv-uxjzYBxw4&jHx6RNUUGV0BRrUcbT>dv0 zzefvVIi9K-fOJM~j=Ob&ci<~P?Stq#UplAD4XyzVHP34os4wYWQ=CbOP5R9yvNyn5><0AuiisQ}&utp{@l iFb6Nt^Z_VtFTfwTK`iH2%W=H`0000>;7 z3U?0B$Vd;Z&k>h^g$V99K@0n95n>Y5blI=~tZZww!VnH9K~In21Smn2#y|K7}_t$Y8r`PIWXV)0A1X`J%btzSVR%TnI_muBNw#ASRNT5WZ3Q%Wu6qPQJ z9?0JGMvx9jVM_o-7y<6eWY!5y0iu;b$>_d7cfjlhh@vY%WEYG;cK`}#7g!3_1q8rzku~!A5SzV!Tj?IVqES4D~R!U z6GU%5UZ8gY_9jdhAi;DORDjWJ)~&4d_u98ph6LyZS1wX&Y3q^@JD_)410jON-6W9! zR|~uo;Vw9;)B^429j9+{yP}`c!SSAVV?cM@V|ogm2R{B{uIN3DNjQZ0-D1gFpF5z2rZsfY+`03i_(Hv?)F zJ@Pi!V<-a92bc3akL$XcW4I}CGoaPCTkZEVtS$sSfv3Hcmzo0KNq+G(ufwp zNa3$~8uW^ICm2b*6rpQ?#CgE20ksB6W5@VsfQNlQ7oH2I_iJtQY7|ueA(Af4y(pI? zzP8d@{eqhmXo>H!5(RDyAP`-l8v{@+an%5HA+%&SLg~dfiYMIE02ChsJTyT)@~uv4 zuD4FGHprtfreBYjH}hx+mt6zU6DYAhi?}i%Pc^He?8<-^Zk`eweWZ1E^;!ZoAIz9G z;3+htK1Q>g0#Cwca#-RTTv!H3u6FNQ+K~k",}, + "moments": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "tracks": [ + {"name":"frames","spriteId":null,"keyframes":{"Keyframes":[ + {"id":"3262d87f-3ebf-4526-a786-66335f26f004","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"b4695467-7b63-4769-bb1c-d41f940fe2f3","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"90c475c6-bc96-4de4-9b53-90f1e070df42","Key":1.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"993217e7-fb50-46df-aacd-eb60145b908f","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"69b4fa83-fa63-44ae-89a4-9ba45743c48e","Key":2.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"3d9ff4fd-38bc-4185-b5ab-f2322102f5ea","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + {"id":"f29d4d9d-b66f-419d-9ccf-f649e784d94b","Key":3.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"6318b594-701e-4090-a2bd-b4fdaf77fa8c","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, + ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, + ], + "visibleRange": null, + "lockOrigin": false, + "showBackdrop": true, + "showBackdropImage": false, + "backdropImagePath": "", + "backdropImageOpacity": 0.5, + "backdropWidth": 1366, + "backdropHeight": 768, + "backdropXOffset": 0.0, + "backdropYOffset": 0.0, + "xorigin": 27, + "yorigin": 29, + "eventToFunction": {}, + "eventStubScript": null, + "parent": {"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",}, + "resourceVersion": "1.3", + "name": "spr_fluff", + "tags": [], + "resourceType": "GMSequence", + }, + "layers": [ + {"visible":true,"isLocked":false,"blendMode":0,"opacity":100.0,"displayName":"default","resourceVersion":"1.0","name":"fc43a414-e9ce-4ae5-a0e9-dde7686e071b","tags":[],"resourceType":"GMImageLayer",}, + ], + "nineSlice": null, + "parent": { + "name": "thpj3", + "path": "thpj3.yyp", + }, + "resourceVersion": "1.0", + "name": "spr_fluff", + "tags": [], + "resourceType": "GMSprite", +} \ No newline at end of file diff --git a/thpj3/thpj3.yyp b/thpj3/thpj3.yyp index 0706f36..baf5d35 100644 --- a/thpj3/thpj3.yyp +++ b/thpj3/thpj3.yyp @@ -9,6 +9,7 @@ {"id":{"name":"obj_title_moon","path":"objects/obj_title_moon/obj_title_moon.yy",},"order":1,}, {"id":{"name":"obj_option_shot","path":"objects/obj_option_shot/obj_option_shot.yy",},"order":21,}, {"id":{"name":"spr_title_star","path":"sprites/spr_title_star/spr_title_star.yy",},"order":7,}, + {"id":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"order":25,}, {"id":{"name":"scr_dialogue_start","path":"scripts/scr_dialogue_start/scr_dialogue_start.yy",},"order":10,}, {"id":{"name":"rm_disclaimer","path":"rooms/rm_disclaimer/rm_disclaimer.yy",},"order":3,}, {"id":{"name":"spr_options","path":"sprites/spr_options/spr_options.yy",},"order":16,}, @@ -16,6 +17,7 @@ {"id":{"name":"obj_wriggle","path":"objects/obj_wriggle/obj_wriggle.yy",},"order":11,}, {"id":{"name":"spr_title_bg","path":"sprites/spr_title_bg/spr_title_bg.yy",},"order":5,}, {"id":{"name":"spr_wriggle","path":"sprites/spr_wriggle/spr_wriggle.yy",},"order":14,}, + {"id":{"name":"obj_enemy_test","path":"objects/obj_enemy_test/obj_enemy_test.yy",},"order":24,}, {"id":{"name":"obj_player_shot","path":"objects/obj_player_shot/obj_player_shot.yy",},"order":17,}, {"id":{"name":"spr_option_shot","path":"sprites/spr_option_shot/spr_option_shot.yy",},"order":19,}, {"id":{"name":"Room3","path":"rooms/Room3/Room3.yy",},"order":6,}, @@ -25,6 +27,8 @@ {"id":{"name":"spr_text_arrow","path":"sprites/spr_text_arrow/spr_text_arrow.yy",},"order":1,}, {"id":{"name":"fn_contact","path":"fonts/fn_contact/fn_contact.yy",},"order":0,}, {"id":{"name":"spr_title_moon","path":"sprites/spr_title_moon/spr_title_moon.yy",},"order":6,}, + {"id":{"name":"obj_enemy_parent","path":"objects/obj_enemy_parent/obj_enemy_parent.yy",},"order":23,}, + {"id":{"name":"fn_GUI","path":"fonts/fn_GUI/fn_GUI.yy",},"order":22,}, {"id":{"name":"obj_title_star","path":"objects/obj_title_star/obj_title_star.yy",},"order":2,}, {"id":{"name":"spr_text_box","path":"sprites/spr_text_box/spr_text_box.yy",},"order":2,}, {"id":{"name":"obj_title_title","path":"objects/obj_title_title/obj_title_title.yy",},"order":4,},