Skip to content

simplify small parts of the codebase #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
setupwitch wants to merge 1 commit into
base: main
Choose a base branch
from
Open

simplify small parts of the codebase #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CompleteCook.yyp
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions objects/obj_pause/Step_1.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
{
Expand Down
38 changes: 37 additions & 1 deletion objects/obj_player/Create_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
100 changes: 2 additions & 98 deletions objects/obj_player/Step_0.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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
{
Expand Down
15 changes: 15 additions & 0 deletions options/reddit/options_reddit.yy
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions scripts/player_util/player_util.gml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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()
Expand Down