diff --git a/CompleteCook.yyp b/CompleteCook.yyp index 456c7e72..bf912959 100644 --- a/CompleteCook.yyp +++ b/CompleteCook.yyp @@ -111,7 +111,7 @@ "isEcma":false, "LibraryEmitters":[], "MetaData":{ - "IDEVersion":"2024.14.2.213", + "IDEVersion":"2024.14.3.217", }, "name":"CompleteCook", "resources":[ diff --git a/objects/obj_pause/Step_1.gml b/objects/obj_pause/Step_1.gml index 1e6df18d..4dd784d4 100644 --- a/objects/obj_pause/Step_1.gml +++ b/objects/obj_pause/Step_1.gml @@ -1,10 +1,5 @@ -if room == mainmenu +if room == mainmenu || (instance_exists(obj_shell) && obj_shell.isOpen) exit; -else if instance_exists(obj_shell) -{ - if obj_shell.isOpen - exit; -} if instance_exists(obj_options) { diff --git a/objects/obj_player/Create_0.gml b/objects/obj_player/Create_0.gml index cb9a498a..51ed80e9 100644 --- a/objects/obj_player/Create_0.gml +++ b/objects/obj_player/Create_0.gml @@ -18,12 +18,48 @@ input = collide_init() +#region Player States + +player_states = []; + +player_states[states.taunt] = player_taunt; +player_states[states.normal] = player_normal; +player_states[states.jump] = player_jump; +player_states[states.mach2] = player_mach2; +player_states[states.mach3] = player_mach3; +player_states[states.tumble] = player_tumble; +player_states[states.slide] = player_slide; +player_states[states.climbwall] = player_climbwall; +player_states[states.bump] = player_bump; +player_states[states.groundpound] = player_groundpound; +player_states[states.grab] = player_grab; +player_states[states.superjump] = player_superjump; +player_states[states.crouch] = player_crouch; +player_states[states.actor] = player_actor; +player_states[states.ladder] = player_ladder; +player_states[states.punch] = player_punch; +player_states[states.hold] = player_hold; +player_states[states.punchenemy] = player_punchenemy; +player_states[states.piledriver] = player_piledriver; +player_states[states.swingding] = player_swingding; +player_states[states.grind] = player_grind; +player_states[states.hurt] = player_hurt; +player_states[states.parry] = player_parry; +player_states[states.backtohub] = player_backtohub; +player_states[states.noclip] = player_noclip; +player_states[states.defeat] = player_defeat; +player_states[states.punchstun] = player_punchstun; +player_states[states.fireass] = player_fireass; +player_states[states.shotgunshoot] = player_shotgunshoot; +player_states[states.ball] = player_ball; + +#endregion + spawn = "a" door_type = fade_types.none wasclimbingwall = false coyote_time = 0 movespeed = 0 -state = states.normal //exitdoor properties state = states.actor sprite_index = spr_player_walkfront diff --git a/objects/obj_player/Step_0.gml b/objects/obj_player/Step_0.gml index 9a79d62b..72881852 100644 --- a/objects/obj_player/Step_0.gml +++ b/objects/obj_player/Step_0.gml @@ -17,11 +17,6 @@ if !pausestopframe input.groundpound.update(global.keybinds.groundpound); } - /* - if (!obj_shell.isOpen) - get_input() - */ - input_buffers.grab = max(input_buffers.grab - 1, 0) input_buffers.jump = max(input_buffers.jump - 1, 0) @@ -54,99 +49,8 @@ if warping if hitstun < 0 { - switch (state) - { - case states.taunt: - player_taunt() - break; - case states.normal: - player_normal() - break; - case states.jump: - player_jump() - break; - case states.mach2: - player_mach2() - break; - case states.mach3: - player_mach3() - break; - case states.tumble: - player_tumble() - break; - case states.slide: - player_slide() - break; - case states.climbwall: - player_climbwall() - break; - case states.bump: - player_bump() - break; - case states.groundpound: - player_groundpound() - break; - case states.grab: - player_grab() - break; - case states.superjump: - player_superjump() - break; - case states.crouch: - player_crouch() - break; - case states.actor: - player_actor() - break; - case states.ladder: - player_ladder() - break; - case states.punch: - player_punch() - break; - case states.hold: - player_hold() - break; - case states.punchenemy: - player_punchenemy() - break; - case states.piledriver: - player_piledriver() - break; - case states.swingding: - player_swingding() - break; - case states.grind: - player_grind() - break; - case states.hurt: - player_hurt() - break; - case states.parry: - player_parry() - break; - case states.backtohub: - player_backtohub() - break; - case states.noclip: - player_noclip() - break; - case states.defeat: - player_defeat() - break; - case states.punchstun: - player_punchstun() - break; - case states.fireass: - player_fireass() - break; - case states.shotgunshoot: - player_shotgunshoot() - break; - case states.ball: - player_ball() - break; - } + // execute state code + player_states[state](); } else if hitstun >= 0 { diff --git a/options/reddit/options_reddit.yy b/options/reddit/options_reddit.yy new file mode 100644 index 00000000..3a0f503c --- /dev/null +++ b/options/reddit/options_reddit.yy @@ -0,0 +1,15 @@ +{ + "$GMRedditOptions":"v2", + "%Name":"Reddit", + "name":"Reddit", + "option_reddit_devvit_project_id":"${project_name}", + "option_reddit_devvit_project_path":"", + "option_reddit_display_cursor":true, + "option_reddit_game_name":"${project_name}", + "option_reddit_interpolate_pixels":true, + "option_reddit_scale":0, + "option_reddit_texture_page":"2048x2048", + "option_reddit_transparent_background":false, + "resourceType":"GMRedditOptions", + "resourceVersion":"2.0", +} \ No newline at end of file diff --git a/scripts/player_util/player_util.gml b/scripts/player_util/player_util.gml index 63d9e4a8..1c505b49 100644 --- a/scripts/player_util/player_util.gml +++ b/scripts/player_util/player_util.gml @@ -1,6 +1,6 @@ -function anim_ended() +function anim_ended(_img_index = image_index, _img_number = image_number) { - return image_index >= image_number - 1; + return _img_index >= _img_number - 1; } function do_groundpound()