From 6e83684eb2fb7f7386285562561399ba7d7ce52c Mon Sep 17 00:00:00 2001 From: Jennifer Hogueison Date: Sun, 4 Feb 2024 21:09:56 -0800 Subject: [PATCH] catch-up --- objects/obj_disclaimer/Create_0.gml | 2 +- objects/obj_disclaimer/Step_0.gml | 1 + options/main/options_main.yy | 4 +- scripts/scr_initialize/scr_initialize.gml | 8 +-- scripts/scr_input_get/scr_input_get.gml | 62 +++++++++---------- sprites/spr_badend/spr_badend.yy | 2 +- sprites/spr_cherryfield/spr_cherryfield.yy | 2 +- sprites/spr_cherryfloor/spr_cherryfloor.yy | 2 +- sprites/spr_go/spr_go.yy | 2 +- sprites/spr_goodend/spr_goodend.yy | 2 +- sprites/spr_mystia_power/spr_mystia_power.yy | 2 +- sprites/spr_mystia_stand/spr_mystia_stand.yy | 2 +- .../spr_particle_cherry.yy | 2 +- sprites/spr_ready/spr_ready.yy | 2 +- sprites/spr_roastbirb/spr_roastbirb.yy | 2 +- .../spr_saigyouayakashi_cherry.yy | 2 +- .../spr_saigyouayakashi_trunk.yy | 2 +- sprites/spr_shadow/spr_shadow.yy | 2 +- sprites/spr_shot/spr_shot.yy | 2 +- sprites/spr_shot_toomuch/spr_shot_toomuch.yy | 2 +- sprites/spr_sky/spr_sky.yy | 2 +- sprites/spr_sparkle/spr_sparkle.yy | 2 +- sprites/spr_table/spr_table.yy | 2 +- sprites/spr_title/spr_title.yy | 2 +- sprites/spr_when/spr_when.yy | 2 +- .../spr_wriggle_blush/spr_wriggle_blush.yy | 2 +- sprites/spr_youmu_blush/spr_youmu_blush.yy | 2 +- .../spr_youmu_facepalm/spr_youmu_facepalm.yy | 2 +- sprites/spr_youmu_stand/spr_youmu_stand.yy | 2 +- .../spr_yuyuko_hungry/spr_yuyuko_hungry.yy | 2 +- thj7.yyp | 9 ++- 31 files changed, 69 insertions(+), 67 deletions(-) diff --git a/objects/obj_disclaimer/Create_0.gml b/objects/obj_disclaimer/Create_0.gml index 10ecc01..33068fb 100644 --- a/objects/obj_disclaimer/Create_0.gml +++ b/objects/obj_disclaimer/Create_0.gml @@ -3,4 +3,4 @@ scr_initialize(); counter = 0; countermax = 240; -alpha_cycle = 0; \ No newline at end of file +alpha_cycle = 0; \ No newline at end of file diff --git a/objects/obj_disclaimer/Step_0.gml b/objects/obj_disclaimer/Step_0.gml index 9410e21..7b0b96f 100644 --- a/objects/obj_disclaimer/Step_0.gml +++ b/objects/obj_disclaimer/Step_0.gml @@ -9,3 +9,4 @@ if (counter > 180) { if ( counter >= countermax ) { room_goto_next(); } + diff --git a/options/main/options_main.yy b/options/main/options_main.yy index a25e474..cae01f3 100644 --- a/options/main/options_main.yy +++ b/options/main/options_main.yy @@ -8,12 +8,14 @@ "option_steam_app_id": "0", "option_sci_usesci": false, "option_author": "", + "option_collision_compatibility": true, + "option_copy_on_write_enabled": true, "option_lastchanged": "", "option_spine_licence": false, "option_template_image": "${base_options_dir}/main/template_image.png", "option_template_icon": "${base_options_dir}/main/template_icon.png", "option_template_description": null, - "resourceVersion": "1.2", + "resourceVersion": "1.4", "name": "Main", "tags": [], "resourceType": "GMMainOptions", diff --git a/scripts/scr_initialize/scr_initialize.gml b/scripts/scr_initialize/scr_initialize.gml index 4302832..6a44862 100644 --- a/scripts/scr_initialize/scr_initialize.gml +++ b/scripts/scr_initialize/scr_initialize.gml @@ -1,5 +1,4 @@ /// @function scr_initialize(); - #region //define global constants //general options #macro WINDOW_BASE_WIDTH 640 @@ -46,8 +45,8 @@ #macro SCORE_HITS 1 #macro SCORE_WHEN_HITS -1 - //particle systems - #macro PART_CHERRYRAIN 0 + //particle systems + #macro PART_CHERRYRAIN 0 //player variables #macro SPAWN_X 80 @@ -89,4 +88,5 @@ function scr_initialize() { scr_input_init(); global.score_current = 0; scr_particles_init(); -} \ No newline at end of file +} + diff --git a/scripts/scr_input_get/scr_input_get.gml b/scripts/scr_input_get/scr_input_get.gml index bc9c56e..5eb7329 100644 --- a/scripts/scr_input_get/scr_input_get.gml +++ b/scripts/scr_input_get/scr_input_get.gml @@ -1,34 +1,34 @@ -/// @function scr_input_get( _input ) -/// @param {real} _input + /// @function scr_input_get( _input ) + /// @param {real} _input -function scr_input_get( _input ) { + function scr_input_get( _input ) { -var keycheck = false; -//TODO: add multiple control methods - if ( global.options[? OPTIONS_INPUT_TYPE] == "keyboard" ) { - switch ( _input ) { - #region continuous inputs - case INPUT_UP: - case INPUT_DOWN: - case INPUT_LEFT: - case INPUT_RIGHT: - case INPUT_FOCUS: - case INPUT_SHOT_LEFT: - case INPUT_SHOT_RIGHT: - keycheck = keyboard_check( global.keyboard[? _input] ); - break; - #endregion - #region pressed inputs - case INPUT_BOMB: - case INPUT_PAUSE: - case INPUT_ANY: - keycheck = keyboard_check_pressed( global.keyboard[? _input] ); - break; - #endregion - default: - break; - } - } + var keycheck = false; + //TODO: add multiple control methods + if ( global.options[? OPTIONS_INPUT_TYPE] == "keyboard" ) { + switch ( _input ) { + #region continuous inputs + case INPUT_UP: + case INPUT_DOWN: + case INPUT_LEFT: + case INPUT_RIGHT: + case INPUT_FOCUS: + case INPUT_SHOT_LEFT: + case INPUT_SHOT_RIGHT: + keycheck = keyboard_check( global.keyboard[? _input] ); + break; + #endregion + #region pressed inputs + case INPUT_BOMB: + case INPUT_PAUSE: + case INPUT_ANY: + keycheck = keyboard_check_pressed( global.keyboard[? _input] ); + break; + #endregion + default: + break; + } + } - return keycheck; -} \ No newline at end of file + return keycheck; + } \ No newline at end of file diff --git a/sprites/spr_badend/spr_badend.yy b/sprites/spr_badend/spr_badend.yy index 034162f..23b1e53 100644 --- a/sprites/spr_badend/spr_badend.yy +++ b/sprites/spr_badend/spr_badend.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_badend","path":"sprites/spr_badend/spr_badend.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_badend", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_cherryfield/spr_cherryfield.yy b/sprites/spr_cherryfield/spr_cherryfield.yy index 900e699..9d8950e 100644 --- a/sprites/spr_cherryfield/spr_cherryfield.yy +++ b/sprites/spr_cherryfield/spr_cherryfield.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_cherryfield","path":"sprites/spr_cherryfield/spr_cherryfield.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_cherryfield", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_cherryfloor/spr_cherryfloor.yy b/sprites/spr_cherryfloor/spr_cherryfloor.yy index 0b15a17..cdd9879 100644 --- a/sprites/spr_cherryfloor/spr_cherryfloor.yy +++ b/sprites/spr_cherryfloor/spr_cherryfloor.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_cherryfloor","path":"sprites/spr_cherryfloor/spr_cherryfloor.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_cherryfloor", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_go/spr_go.yy b/sprites/spr_go/spr_go.yy index 224b973..754c0fe 100644 --- a/sprites/spr_go/spr_go.yy +++ b/sprites/spr_go/spr_go.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_go","path":"sprites/spr_go/spr_go.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_go", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_goodend/spr_goodend.yy b/sprites/spr_goodend/spr_goodend.yy index 86ad9cd..35ba4d3 100644 --- a/sprites/spr_goodend/spr_goodend.yy +++ b/sprites/spr_goodend/spr_goodend.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_goodend","path":"sprites/spr_goodend/spr_goodend.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_goodend", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_mystia_power/spr_mystia_power.yy b/sprites/spr_mystia_power/spr_mystia_power.yy index 5732376..ffc5a14 100644 --- a/sprites/spr_mystia_power/spr_mystia_power.yy +++ b/sprites/spr_mystia_power/spr_mystia_power.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_mystia_power","path":"sprites/spr_mystia_power/spr_mystia_power.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_mystia_power", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_mystia_stand/spr_mystia_stand.yy b/sprites/spr_mystia_stand/spr_mystia_stand.yy index 728fc79..660b77e 100644 --- a/sprites/spr_mystia_stand/spr_mystia_stand.yy +++ b/sprites/spr_mystia_stand/spr_mystia_stand.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_mystia_stand","path":"sprites/spr_mystia_stand/spr_mystia_stand.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_mystia_stand", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_particle_cherry/spr_particle_cherry.yy b/sprites/spr_particle_cherry/spr_particle_cherry.yy index dc9894f..1db6315 100644 --- a/sprites/spr_particle_cherry/spr_particle_cherry.yy +++ b/sprites/spr_particle_cherry/spr_particle_cherry.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_particle_cherry","path":"sprites/spr_particle_cherry/spr_particle_cherry.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_particle_cherry", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_ready/spr_ready.yy b/sprites/spr_ready/spr_ready.yy index e4f2c7c..76fcccd 100644 --- a/sprites/spr_ready/spr_ready.yy +++ b/sprites/spr_ready/spr_ready.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_ready","path":"sprites/spr_ready/spr_ready.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_ready", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_roastbirb/spr_roastbirb.yy b/sprites/spr_roastbirb/spr_roastbirb.yy index fced928..ea471ad 100644 --- a/sprites/spr_roastbirb/spr_roastbirb.yy +++ b/sprites/spr_roastbirb/spr_roastbirb.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_roastbirb","path":"sprites/spr_roastbirb/spr_roastbirb.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_roastbirb", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy b/sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy index ae272e1..63336d9 100644 --- a/sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy +++ b/sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_saigyouayakashi_cherry","path":"sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_saigyouayakashi_cherry", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy b/sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy index 93561a7..bb693a0 100644 --- a/sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy +++ b/sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_saigyouayakashi_trunk","path":"sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_saigyouayakashi_trunk", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_shadow/spr_shadow.yy b/sprites/spr_shadow/spr_shadow.yy index 0f422b4..f6fb408 100644 --- a/sprites/spr_shadow/spr_shadow.yy +++ b/sprites/spr_shadow/spr_shadow.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_shadow","path":"sprites/spr_shadow/spr_shadow.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_shadow", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_shot/spr_shot.yy b/sprites/spr_shot/spr_shot.yy index f903f7e..0090a86 100644 --- a/sprites/spr_shot/spr_shot.yy +++ b/sprites/spr_shot/spr_shot.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_shot","path":"sprites/spr_shot/spr_shot.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_shot", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_shot_toomuch/spr_shot_toomuch.yy b/sprites/spr_shot_toomuch/spr_shot_toomuch.yy index 8dec8b2..c6d1421 100644 --- a/sprites/spr_shot_toomuch/spr_shot_toomuch.yy +++ b/sprites/spr_shot_toomuch/spr_shot_toomuch.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_shot_toomuch","path":"sprites/spr_shot_toomuch/spr_shot_toomuch.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_shot_toomuch", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_sky/spr_sky.yy b/sprites/spr_sky/spr_sky.yy index 1ce4fdf..9702048 100644 --- a/sprites/spr_sky/spr_sky.yy +++ b/sprites/spr_sky/spr_sky.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_sky","path":"sprites/spr_sky/spr_sky.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_sky", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_sparkle/spr_sparkle.yy b/sprites/spr_sparkle/spr_sparkle.yy index 1f8ccad..a756577 100644 --- a/sprites/spr_sparkle/spr_sparkle.yy +++ b/sprites/spr_sparkle/spr_sparkle.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_sparkle","path":"sprites/spr_sparkle/spr_sparkle.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_sparkle", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_table/spr_table.yy b/sprites/spr_table/spr_table.yy index 18e58c1..40b56ba 100644 --- a/sprites/spr_table/spr_table.yy +++ b/sprites/spr_table/spr_table.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_table","path":"sprites/spr_table/spr_table.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_table", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_title/spr_title.yy b/sprites/spr_title/spr_title.yy index a725fff..3a98324 100644 --- a/sprites/spr_title/spr_title.yy +++ b/sprites/spr_title/spr_title.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_title","path":"sprites/spr_title/spr_title.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_title", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_when/spr_when.yy b/sprites/spr_when/spr_when.yy index 8bbcb3c..638bdbd 100644 --- a/sprites/spr_when/spr_when.yy +++ b/sprites/spr_when/spr_when.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_when","path":"sprites/spr_when/spr_when.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_when", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_wriggle_blush/spr_wriggle_blush.yy b/sprites/spr_wriggle_blush/spr_wriggle_blush.yy index 3724b3b..7fa9724 100644 --- a/sprites/spr_wriggle_blush/spr_wriggle_blush.yy +++ b/sprites/spr_wriggle_blush/spr_wriggle_blush.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_wriggle_blush","path":"sprites/spr_wriggle_blush/spr_wriggle_blush.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_wriggle_blush", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_youmu_blush/spr_youmu_blush.yy b/sprites/spr_youmu_blush/spr_youmu_blush.yy index c6dd481..5fb5112 100644 --- a/sprites/spr_youmu_blush/spr_youmu_blush.yy +++ b/sprites/spr_youmu_blush/spr_youmu_blush.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_youmu_blush","path":"sprites/spr_youmu_blush/spr_youmu_blush.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_youmu_blush", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy b/sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy index 603cea0..886149f 100644 --- a/sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy +++ b/sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_youmu_facepalm","path":"sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_youmu_facepalm", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_youmu_stand/spr_youmu_stand.yy b/sprites/spr_youmu_stand/spr_youmu_stand.yy index ecd929d..a324614 100644 --- a/sprites/spr_youmu_stand/spr_youmu_stand.yy +++ b/sprites/spr_youmu_stand/spr_youmu_stand.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_youmu_stand","path":"sprites/spr_youmu_stand/spr_youmu_stand.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_youmu_stand", "tags": [], "resourceType": "GMSequence", diff --git a/sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy b/sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy index 49ece06..0d2f6a9 100644 --- a/sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy +++ b/sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy @@ -59,7 +59,7 @@ "eventToFunction": {}, "eventStubScript": null, "parent": {"name":"spr_yuyuko_hungry","path":"sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy",}, - "resourceVersion": "1.3", + "resourceVersion": "1.4", "name": "spr_yuyuko_hungry", "tags": [], "resourceType": "GMSequence", diff --git a/thj7.yyp b/thj7.yyp index 1d6f627..8f4bc7b 100644 --- a/thj7.yyp +++ b/thj7.yyp @@ -66,9 +66,8 @@ {"name":"Windows UWP","path":"options/windowsuap/options_windowsuap.yy",}, {"name":"operagx","path":"options/operagx/options_operagx.yy",}, ], - "isDnDProject": false, + "defaultScriptType": 1, "isEcma": false, - "tutorialPath": "", "configs": { "name": "Default", "children": [], @@ -95,13 +94,13 @@ {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, ], "TextureGroups": [ - {"isScaled":true,"autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, + {"isScaled":true,"compressFormat":"bz2","autocrop":true,"border":2,"mipsToGenerate":0,"groupParent":null,"targets":-1,"resourceVersion":"1.3","name":"Default","resourceType":"GMTextureGroup",}, ], "IncludedFiles": [], "MetaData": { - "IDEVersion": "23.1.1.434", + "IDEVersion": "2022.300.0.499", }, - "resourceVersion": "1.4", + "resourceVersion": "1.5", "name": "thj7", "tags": [], "resourceType": "GMProject",