magicalfeyfenny
/
thj7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

catch-up

This commit is contained in:
Jennifer Hogueison 2024-02-04 21:09:56 -08:00
parent 8bbc0ec78e
commit 6e83684eb2
31 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
objects/obj_disclaimer/Step_0.gml
View File

@ -9,3 +9,4 @@ if (counter > 180) {
if ( counter >= countermax ) { if ( counter >= countermax ) {
room_goto_next(); room_goto_next();
} }

4
options/main/options_main.yy
View File

@ -8,12 +8,14 @@
"option_steam_app_id": "0", "option_steam_app_id": "0",
"option_sci_usesci": false, "option_sci_usesci": false,
"option_author": "", "option_author": "",
"option_collision_compatibility": true,
"option_copy_on_write_enabled": true,
"option_lastchanged": "", "option_lastchanged": "",
"option_spine_licence": false, "option_spine_licence": false,
"option_template_image": "${base_options_dir}/main/template_image.png", "option_template_image": "${base_options_dir}/main/template_image.png",
"option_template_icon": "${base_options_dir}/main/template_icon.png", "option_template_icon": "${base_options_dir}/main/template_icon.png",
"option_template_description": null, "option_template_description": null,
"resourceVersion": "1.2", "resourceVersion": "1.4",
"name": "Main", "name": "Main",
"tags": [], "tags": [],
"resourceType": "GMMainOptions", "resourceType": "GMMainOptions",

6
scripts/scr_initialize/scr_initialize.gml
View File

@ -1,5 +1,4 @@
/// @function scr_initialize(); /// @function scr_initialize();
#region //define global constants #region //define global constants
//general options //general options
#macro WINDOW_BASE_WIDTH 640 #macro WINDOW_BASE_WIDTH 640
@ -46,8 +45,8 @@
#macro SCORE_HITS 1 #macro SCORE_HITS 1
#macro SCORE_WHEN_HITS -1 #macro SCORE_WHEN_HITS -1
//particle systems //particle systems
#macro PART_CHERRYRAIN 0 #macro PART_CHERRYRAIN 0
//player variables //player variables
#macro SPAWN_X 80 #macro SPAWN_X 80
@ -90,3 +89,4 @@ function scr_initialize() {
global.score_current = 0; global.score_current = 0;
scr_particles_init(); scr_particles_init();
} }

62
scripts/scr_input_get/scr_input_get.gml
View File

@ -1,34 +1,34 @@
/// @function scr_input_get( _input ) /// @function scr_input_get( _input )
/// @param {real} _input /// @param {real} _input
function scr_input_get( _input ) { function scr_input_get( _input ) {
var keycheck = false; var keycheck = false;
//TODO: add multiple control methods //TODO: add multiple control methods
if ( global.options[? OPTIONS_INPUT_TYPE] == "keyboard" ) { if ( global.options[? OPTIONS_INPUT_TYPE] == "keyboard" ) {
switch ( _input ) { switch ( _input ) {
#region continuous inputs #region continuous inputs
case INPUT_UP: case INPUT_UP:
case INPUT_DOWN: case INPUT_DOWN:
case INPUT_LEFT: case INPUT_LEFT:
case INPUT_RIGHT: case INPUT_RIGHT:
case INPUT_FOCUS: case INPUT_FOCUS:
case INPUT_SHOT_LEFT: case INPUT_SHOT_LEFT:
case INPUT_SHOT_RIGHT: case INPUT_SHOT_RIGHT:
keycheck = keyboard_check( global.keyboard[? _input] ); keycheck = keyboard_check( global.keyboard[? _input] );
break; break;
#endregion #endregion
#region pressed inputs #region pressed inputs
case INPUT_BOMB: case INPUT_BOMB:
case INPUT_PAUSE: case INPUT_PAUSE:
case INPUT_ANY: case INPUT_ANY:
keycheck = keyboard_check_pressed( global.keyboard[? _input] ); keycheck = keyboard_check_pressed( global.keyboard[? _input] );
break; break;
#endregion #endregion
default: default:
break; break;
}
}
return keycheck;
} }
}
return keycheck;
}

2
sprites/spr_badend/spr_badend.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_badend","path":"sprites/spr_badend/spr_badend.yy",}, "parent": {"name":"spr_badend","path":"sprites/spr_badend/spr_badend.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_badend", "name": "spr_badend",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_cherryfield/spr_cherryfield.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_cherryfield","path":"sprites/spr_cherryfield/spr_cherryfield.yy",}, "parent": {"name":"spr_cherryfield","path":"sprites/spr_cherryfield/spr_cherryfield.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_cherryfield", "name": "spr_cherryfield",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_cherryfloor/spr_cherryfloor.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_cherryfloor","path":"sprites/spr_cherryfloor/spr_cherryfloor.yy",}, "parent": {"name":"spr_cherryfloor","path":"sprites/spr_cherryfloor/spr_cherryfloor.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_cherryfloor", "name": "spr_cherryfloor",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_go/spr_go.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_go","path":"sprites/spr_go/spr_go.yy",}, "parent": {"name":"spr_go","path":"sprites/spr_go/spr_go.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_go", "name": "spr_go",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_goodend/spr_goodend.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_goodend","path":"sprites/spr_goodend/spr_goodend.yy",}, "parent": {"name":"spr_goodend","path":"sprites/spr_goodend/spr_goodend.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_goodend", "name": "spr_goodend",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_mystia_power/spr_mystia_power.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_mystia_power","path":"sprites/spr_mystia_power/spr_mystia_power.yy",}, "parent": {"name":"spr_mystia_power","path":"sprites/spr_mystia_power/spr_mystia_power.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_mystia_power", "name": "spr_mystia_power",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_mystia_stand/spr_mystia_stand.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_mystia_stand","path":"sprites/spr_mystia_stand/spr_mystia_stand.yy",}, "parent": {"name":"spr_mystia_stand","path":"sprites/spr_mystia_stand/spr_mystia_stand.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_mystia_stand", "name": "spr_mystia_stand",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_particle_cherry/spr_particle_cherry.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_particle_cherry","path":"sprites/spr_particle_cherry/spr_particle_cherry.yy",}, "parent": {"name":"spr_particle_cherry","path":"sprites/spr_particle_cherry/spr_particle_cherry.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_particle_cherry", "name": "spr_particle_cherry",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_ready/spr_ready.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_ready","path":"sprites/spr_ready/spr_ready.yy",}, "parent": {"name":"spr_ready","path":"sprites/spr_ready/spr_ready.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_ready", "name": "spr_ready",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_roastbirb/spr_roastbirb.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_roastbirb","path":"sprites/spr_roastbirb/spr_roastbirb.yy",}, "parent": {"name":"spr_roastbirb","path":"sprites/spr_roastbirb/spr_roastbirb.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_roastbirb", "name": "spr_roastbirb",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_saigyouayakashi_cherry","path":"sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy",}, "parent": {"name":"spr_saigyouayakashi_cherry","path":"sprites/spr_saigyouayakashi_cherry/spr_saigyouayakashi_cherry.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_saigyouayakashi_cherry", "name": "spr_saigyouayakashi_cherry",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_saigyouayakashi_trunk","path":"sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy",}, "parent": {"name":"spr_saigyouayakashi_trunk","path":"sprites/spr_saigyouayakashi_trunk/spr_saigyouayakashi_trunk.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_saigyouayakashi_trunk", "name": "spr_saigyouayakashi_trunk",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_shadow/spr_shadow.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_shadow","path":"sprites/spr_shadow/spr_shadow.yy",}, "parent": {"name":"spr_shadow","path":"sprites/spr_shadow/spr_shadow.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_shadow", "name": "spr_shadow",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_shot/spr_shot.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_shot","path":"sprites/spr_shot/spr_shot.yy",}, "parent": {"name":"spr_shot","path":"sprites/spr_shot/spr_shot.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_shot", "name": "spr_shot",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_shot_toomuch/spr_shot_toomuch.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_shot_toomuch","path":"sprites/spr_shot_toomuch/spr_shot_toomuch.yy",}, "parent": {"name":"spr_shot_toomuch","path":"sprites/spr_shot_toomuch/spr_shot_toomuch.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_shot_toomuch", "name": "spr_shot_toomuch",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_sky/spr_sky.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_sky","path":"sprites/spr_sky/spr_sky.yy",}, "parent": {"name":"spr_sky","path":"sprites/spr_sky/spr_sky.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_sky", "name": "spr_sky",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_sparkle/spr_sparkle.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_sparkle","path":"sprites/spr_sparkle/spr_sparkle.yy",}, "parent": {"name":"spr_sparkle","path":"sprites/spr_sparkle/spr_sparkle.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_sparkle", "name": "spr_sparkle",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_table/spr_table.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_table","path":"sprites/spr_table/spr_table.yy",}, "parent": {"name":"spr_table","path":"sprites/spr_table/spr_table.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_table", "name": "spr_table",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_title/spr_title.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_title","path":"sprites/spr_title/spr_title.yy",}, "parent": {"name":"spr_title","path":"sprites/spr_title/spr_title.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_title", "name": "spr_title",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_when/spr_when.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_when","path":"sprites/spr_when/spr_when.yy",}, "parent": {"name":"spr_when","path":"sprites/spr_when/spr_when.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_when", "name": "spr_when",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_wriggle_blush/spr_wriggle_blush.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_wriggle_blush","path":"sprites/spr_wriggle_blush/spr_wriggle_blush.yy",}, "parent": {"name":"spr_wriggle_blush","path":"sprites/spr_wriggle_blush/spr_wriggle_blush.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_wriggle_blush", "name": "spr_wriggle_blush",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_youmu_blush/spr_youmu_blush.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_youmu_blush","path":"sprites/spr_youmu_blush/spr_youmu_blush.yy",}, "parent": {"name":"spr_youmu_blush","path":"sprites/spr_youmu_blush/spr_youmu_blush.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_youmu_blush", "name": "spr_youmu_blush",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_youmu_facepalm","path":"sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy",}, "parent": {"name":"spr_youmu_facepalm","path":"sprites/spr_youmu_facepalm/spr_youmu_facepalm.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_youmu_facepalm", "name": "spr_youmu_facepalm",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_youmu_stand/spr_youmu_stand.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_youmu_stand","path":"sprites/spr_youmu_stand/spr_youmu_stand.yy",}, "parent": {"name":"spr_youmu_stand","path":"sprites/spr_youmu_stand/spr_youmu_stand.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_youmu_stand", "name": "spr_youmu_stand",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

2
sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy
View File

@ -59,7 +59,7 @@
"eventToFunction": {}, "eventToFunction": {},
"eventStubScript": null, "eventStubScript": null,
"parent": {"name":"spr_yuyuko_hungry","path":"sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy",}, "parent": {"name":"spr_yuyuko_hungry","path":"sprites/spr_yuyuko_hungry/spr_yuyuko_hungry.yy",},
"resourceVersion": "1.3", "resourceVersion": "1.4",
"name": "spr_yuyuko_hungry", "name": "spr_yuyuko_hungry",
"tags": [], "tags": [],
"resourceType": "GMSequence", "resourceType": "GMSequence",

9
thj7.yyp
View File

@ -66,9 +66,8 @@
{"name":"Windows UWP","path":"options/windowsuap/options_windowsuap.yy",}, {"name":"Windows UWP","path":"options/windowsuap/options_windowsuap.yy",},
{"name":"operagx","path":"options/operagx/options_operagx.yy",}, {"name":"operagx","path":"options/operagx/options_operagx.yy",},
], ],
"isDnDProject": false, "defaultScriptType": 1,
"isEcma": false, "isEcma": false,
"tutorialPath": "",
"configs": { "configs": {
"name": "Default", "name": "Default",
"children": [], "children": [],
@ -95,13 +94,13 @@
{"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",}, {"targets":-1,"resourceVersion":"1.3","name":"audiogroup_default","resourceType":"GMAudioGroup",},
], ],
"TextureGroups": [ "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": [], "IncludedFiles": [],
"MetaData": { "MetaData": {
"IDEVersion": "23.1.1.434", "IDEVersion": "2022.300.0.499",
}, },
"resourceVersion": "1.4", "resourceVersion": "1.5",
"name": "thj7", "name": "thj7",
"tags": [], "tags": [],
"resourceType": "GMProject", "resourceType": "GMProject",