From 84c978e1418442c147c744572b5ccce636e71cd4 Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 2 Jun 2023 21:46:05 -0700 Subject: [PATCH] Arena - slight hammer buff --- mods/arena/arena-hud.lua | 3 +++ mods/arena/arena-player.lua | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mods/arena/arena-hud.lua b/mods/arena/arena-hud.lua index ad5abab7..f10cebaa 100644 --- a/mods/arena/arena-hud.lua +++ b/mods/arena/arena-hud.lua @@ -198,6 +198,9 @@ function render_health() width = width - 4 * scale height = height - 4 * scale health = mario_health_float(gMarioStates[0]) + if health > 0 and health < 0.02 then + health = 0.02 + end width = math.floor(width * health) rscale = clamp(((1 - health) ^ 2) * 3, 0, 1) gscale = clamp((health ^ 2) * 2, 0, 1) diff --git a/mods/arena/arena-player.lua b/mods/arena/arena-player.lua index 8f33025c..89967c24 100644 --- a/mods/arena/arena-player.lua +++ b/mods/arena/arena-player.lua @@ -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 local pos = mario_hammer_position(mattacker) local dist = vec3f_dist(pos, cmvictim.pos) - if dist <= 165 then + if dist <= 200 then local yOffset = 0.6 if mattacker.action == ACT_JUMP_KICK then yOffset = 1.0 @@ -155,9 +155,9 @@ function mario_local_hammer_check(m) e.lastDamagedByGlobal = npattacker.globalIndex if mattacker.action == ACT_JUMP_KICK or mattacker.action == ACT_DIVE then - m.hurtCounter = 9 + m.hurtCounter = 10 else - m.hurtCounter = 14 + m.hurtCounter = 15 end end end