Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevented water heal in Arena (thanks Coolio and wereyoshi)

This commit is contained in:
MysterD 2023-05-31 20:56:47 -07:00
parent 5de6d50c06
commit 81b3d0ae15
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mods/arena/arena-player.lua
View File

@ -384,6 +384,17 @@ function mario_local_update(m)
play_sound(SOUND_GENERAL_BREAK_BOX, m.marioObj.header.gfx.cameraToObject)
end
-- prevent water heal
if m.health >= 0x100 then
if ((m.healCounter or m.hurtCounter) == 0) then
if ((m.action & ACT_FLAG_SWIMMING ~= 0) and (m.action & ACT_FLAG_INTANGIBLE == 0)) then
if ((m.pos.y >= (m.waterLevel - 140)) and not (m.area.terrainType & TERRAIN_SNOW ~= 0)) then
m.health = m.health - 0x1A
end
end
end
end
-- check for ladder
mario_check_for_ladder(m)