diff --git a/thpj3/fonts/fn_GUI/fn_GUI.png b/thpj3/fonts/fn_GUI/fn_GUI.png new file mode 100644 index 0000000..5f163fa Binary files /dev/null and b/thpj3/fonts/fn_GUI/fn_GUI.png differ 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 0000000..d7e4aa0 Binary files /dev/null and b/thpj3/sprites/spr_fluff/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea.png differ diff --git a/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png b/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png new file mode 100644 index 0000000..6b2c473 Binary files /dev/null and b/thpj3/sprites/spr_fluff/6318b594-701e-4090-a2bd-b4fdaf77fa8c.png differ diff --git a/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png b/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png new file mode 100644 index 0000000..d16aca8 Binary files /dev/null and b/thpj3/sprites/spr_fluff/993217e7-fb50-46df-aacd-eb60145b908f.png differ diff --git a/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png b/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png new file mode 100644 index 0000000..c2c5ff8 Binary files /dev/null and b/thpj3/sprites/spr_fluff/b4695467-7b63-4769-bb1c-d41f940fe2f3.png differ diff --git a/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png new file mode 100644 index 0000000..d7e4aa0 Binary files /dev/null and b/thpj3/sprites/spr_fluff/layers/3d9ff4fd-38bc-4185-b5ab-f2322102f5ea/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png new file mode 100644 index 0000000..6b2c473 Binary files /dev/null and b/thpj3/sprites/spr_fluff/layers/6318b594-701e-4090-a2bd-b4fdaf77fa8c/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png new file mode 100644 index 0000000..d16aca8 Binary files /dev/null and b/thpj3/sprites/spr_fluff/layers/993217e7-fb50-46df-aacd-eb60145b908f/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png b/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png new file mode 100644 index 0000000..c2c5ff8 Binary files /dev/null and b/thpj3/sprites/spr_fluff/layers/b4695467-7b63-4769-bb1c-d41f940fe2f3/fc43a414-e9ce-4ae5-a0e9-dde7686e071b.png differ diff --git a/thpj3/sprites/spr_fluff/spr_fluff.yy b/thpj3/sprites/spr_fluff/spr_fluff.yy new file mode 100644 index 0000000..6f13cc5 --- /dev/null +++ b/thpj3/sprites/spr_fluff/spr_fluff.yy @@ -0,0 +1,91 @@ +{ + "bboxMode": 2, + "collisionKind": 2, + "type": 0, + "origin": 9, + "preMultiplyAlpha": false, + "edgeFiltering": false, + "collisionTolerance": 0, + "swfPrecision": 2.525, + "bbox_left": 6, + "bbox_right": 48, + "bbox_top": 8, + "bbox_bottom": 50, + "HTile": false, + "VTile": false, + "For3D": false, + "width": 64, + "height": 64, + "textureGroupId": { + "name": "Default", + "path": "texturegroups/Default", + }, + "swatchColours": null, + "gridX": 0, + "gridY": 0, + "frames": [ + {"compositeImage":{"FrameId":{"name":"b4695467-7b63-4769-bb1c-d41f940fe2f3","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"b4695467-7b63-4769-bb1c-d41f940fe2f3","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":{"name":"fc43a414-e9ce-4ae5-a0e9-dde7686e071b","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"b4695467-7b63-4769-bb1c-d41f940fe2f3","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"993217e7-fb50-46df-aacd-eb60145b908f","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"993217e7-fb50-46df-aacd-eb60145b908f","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":{"name":"fc43a414-e9ce-4ae5-a0e9-dde7686e071b","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"993217e7-fb50-46df-aacd-eb60145b908f","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"3d9ff4fd-38bc-4185-b5ab-f2322102f5ea","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"3d9ff4fd-38bc-4185-b5ab-f2322102f5ea","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":{"name":"fc43a414-e9ce-4ae5-a0e9-dde7686e071b","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"3d9ff4fd-38bc-4185-b5ab-f2322102f5ea","tags":[],"resourceType":"GMSpriteFrame",}, + {"compositeImage":{"FrameId":{"name":"6318b594-701e-4090-a2bd-b4fdaf77fa8c","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",},"images":[ + {"FrameId":{"name":"6318b594-701e-4090-a2bd-b4fdaf77fa8c","path":"sprites/spr_fluff/spr_fluff.yy",},"LayerId":{"name":"fc43a414-e9ce-4ae5-a0e9-dde7686e071b","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMSpriteBitmap",}, + ],"parent":{"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",},"resourceVersion":"1.0","name":"6318b594-701e-4090-a2bd-b4fdaf77fa8c","tags":[],"resourceType":"GMSpriteFrame",}, + ], + "sequence": { + "spriteId": {"name":"spr_fluff","path":"sprites/spr_fluff/spr_fluff.yy",}, + "timeUnits": 1, + "playback": 1, + "playbackSpeed": 4.0, + "playbackSpeedType": 0, + "autoRecord": true, + "volume": 1.0, + "length": 4.0, + "events": {"Keyframes":[],"resourceVersion":"1.0","resourceType":"KeyframeStore",}, + "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,},