Skip to content

Commit

Permalink
Merge pull request #89 from overbound/feature/rrz-passthrough-hands
Browse files Browse the repository at this point in the history
Altered RRZ boss collisions for Super & invincible
  • Loading branch information
overbound authored Jan 24, 2024
2 parents dae0730 + e94dbb2 commit 151a498
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/objects/objGolem/Step_0.gml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ if (timer) {
depth_mask = 3;
//reaction_script2 = player_reaction_golem_hand_target;
reaction_script2 = player_reaction_golem_hand;
through = objLevel.player[0].superform || objLevel.player[0].invincibility;
}

if (other.sideDown == sideOn) {
Expand Down
1 change: 1 addition & 0 deletions src/objects/objGolemHand/Collision_objPlayer.gml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
through = other.superform || other.invincibility;
if depth_mask == 4 && reaction_script2 != noone {
with other script_execute(other.reaction_script2,other);
reaction_script2 = noone;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
function player_reaction_golem_hand(argument0, argument1) {
// player_reaction_golem_hand(local_id, code)
if invulnerable || instashield || state==player_state_hurt || state==player_state_dead return false;
if invulnerable || superform || invincibility || instashield || state==player_state_hurt || state==player_state_dead return false;
if argument0.depth_mask == 3 {
if argument1!=2
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ function player_reaction_golem_hand_target(argument0) {
argument0.alarm[0] = 25;
return true;
}
if (spinning or state==player_state_glide or state==player_state_glide_slide) && argument0.hit == 0
if (spinning or superform or invincibility or state==player_state_glide or state==player_state_glide_slide) && argument0.hit == 0
{
xspeed = -xspeed;

Expand Down

0 comments on commit 151a498

Please sign in to comment.