thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update revamped flying damage (#722)

Browse source
This commit is contained in:
Sunk 2025-03-28 01:11:05 -04:00 • committed by GitHub
parent bfdbbea175
commit 1a23932e9b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/interaction.c
View file

@ -1344,7 +1344,7 @@ u8 determine_player_damage_value(struct MarioState* attacker, u32 interaction) {
else if (interaction & INT_GROUND_POUND) { return 3; }
else if (interaction & (INT_KICK | INT_SLIDE_KICK | INT_TRIP | INT_TWIRL)) { return 2; }
else if (interaction & INT_PUNCH && attacker->actionArg < 3) { return 2; }
else if (attacker->action == ACT_FLYING) { return (u8)(attacker->forwardVel / 75.0f) + 1; }
else if (attacker->action == ACT_FLYING) { return (u8)(MAX((attacker->forwardVel - 40.0f) / 20.0f, 0)) + 1; }
return 1;
} else {
if (interaction & INT_GROUND_POUND_OR_TWIRL) { return 3; }