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

Arena - slight hammer buff

This commit is contained in:
MysterD 2023-06-02 21:46:05 -07:00
parent 9a6c01c2d4
commit 84c978e141
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mods/arena/arena-hud.lua
View File

@ -198,6 +198,9 @@ function render_health()
width = width - 4 * scale width = width - 4 * scale
height = height - 4 * scale height = height - 4 * scale
health = mario_health_float(gMarioStates[0]) health = mario_health_float(gMarioStates[0])
if health > 0 and health < 0.02 then
health = 0.02
end
width = math.floor(width * health) width = math.floor(width * health)
rscale = clamp(((1 - health) ^ 2) * 3, 0, 1) rscale = clamp(((1 - health) ^ 2) * 3, 0, 1)
gscale = clamp((health ^ 2) * 2, 0, 1) gscale = clamp((health ^ 2) * 2, 0, 1)

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

@ -127,7 +127,7 @@ function mario_local_hammer_check(m)
if sattacker.item == ITEM_HAMMER and mario_hammer_is_attack(mattacker.action) and passes_pvp_interaction_checks(mattacker, cmvictim) ~= 0 and passes_pvp_interaction_checks(mattacker, m) ~= 0 and global_index_hurts_mario_state(npattacker.globalIndex, m) then if sattacker.item == ITEM_HAMMER and mario_hammer_is_attack(mattacker.action) and passes_pvp_interaction_checks(mattacker, cmvictim) ~= 0 and passes_pvp_interaction_checks(mattacker, m) ~= 0 and global_index_hurts_mario_state(npattacker.globalIndex, m) then
local pos = mario_hammer_position(mattacker) local pos = mario_hammer_position(mattacker)
local dist = vec3f_dist(pos, cmvictim.pos) local dist = vec3f_dist(pos, cmvictim.pos)
if dist <= 165 then if dist <= 200 then
local yOffset = 0.6 local yOffset = 0.6
if mattacker.action == ACT_JUMP_KICK then if mattacker.action == ACT_JUMP_KICK then
yOffset = 1.0 yOffset = 1.0
@ -155,9 +155,9 @@ function mario_local_hammer_check(m)
e.lastDamagedByGlobal = npattacker.globalIndex e.lastDamagedByGlobal = npattacker.globalIndex
if mattacker.action == ACT_JUMP_KICK or mattacker.action == ACT_DIVE then if mattacker.action == ACT_JUMP_KICK or mattacker.action == ACT_DIVE then
m.hurtCounter = 9 m.hurtCounter = 10
else else
m.hurtCounter = 14 m.hurtCounter = 15
end end
end end
end end