thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-05-07 01:12:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adjust numbers

Browse source 
Breakdances should not deal 3 damage
This commit is contained in:
Sunk 2024-10-08 02:07:05 -04:00
parent 902f04c08a
commit c1783bef1a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/game/interaction.c
View file

@ -674,7 +674,7 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) {
if (m2->marioObj != m->interactObj) { continue; }
if (m2->flags & MARIO_KICKING) { scaler = 2.0f; }
else if (m2->action == ACT_DIVE) { scaler = 1 + fabs(m2->forwardVel * 0.01f); }
else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2; hasBeenPunched = TRUE; }
else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2f; hasBeenPunched = TRUE; }
if (m2->flags & MARIO_METAL_CAP) { scaler *= 1.25f; }
break;
}
@ -1318,8 +1318,8 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2)
}
u8 determine_player_damage_value(u32 interaction) {
if (interaction & (INT_GROUND_POUND | INT_TRIP)) { return 3; }
if (interaction & (INT_KICK | INT_SLIDE_KICK | INT_TWIRL)) { return 2; }
if (interaction & INT_GROUND_POUND) { return 3; }
if (interaction & (INT_KICK | INT_SLIDE_KICK | INT_TRIP | INT_TWIRL)) { return 2; }
return 1;
}