From 093bddfedd5b62b9bcd3934e5c194775a91a4f08 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Fri, 28 Apr 2023 13:25:13 -0700
Subject: [PATCH] More arena balance tweaks/bug fixes

---
 mods/arena/arena-player.lua     |  3 ++-
 mods/arena/arena-proj-flame.lua | 12 ++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/mods/arena/arena-player.lua b/mods/arena/arena-player.lua
index 3ecf557a..103d6d18 100644
--- a/mods/arena/arena-player.lua
+++ b/mods/arena/arena-player.lua
@@ -147,13 +147,14 @@ function mario_local_hammer_check(m)
                 m.vel.y = vel.y
                 m.vel.z = vel.z
                 m.faceAngle.y = atan2s(vel.z, vel.x) + 0x8000
+                m.forwardVel = 0
                 sattacker.ammo = sattacker.ammo - 1
 
                 send_arena_hammer_hit(np.globalIndex, npattacker.globalIndex)
                 e.lastDamagedByGlobal = npattacker.globalIndex
 
                 if mattacker.action == ACT_JUMP_KICK or mattacker.action == ACT_DIVE then
-                    m.hurtCounter = 1
+                    m.hurtCounter = 9
                 else
                     m.hurtCounter = 14
                 end
diff --git a/mods/arena/arena-proj-flame.lua b/mods/arena/arena-proj-flame.lua
index ddf78605..e43ee806 100644
--- a/mods/arena/arena-proj-flame.lua
+++ b/mods/arena/arena-proj-flame.lua
@@ -13,11 +13,11 @@ function bhv_arena_child_flame_init(obj)
     end
     obj.oGraphYOffset = 30
 
-    obj.hitboxRadius = 25
+    obj.hitboxRadius = 35
     obj.hitboxHeight = 10
     obj.hitboxDownOffset = 0
 
-    obj.hurtboxRadius = 25
+    obj.hurtboxRadius = 35
     obj.hurtboxHeight = 10
 
     obj.oWallHitboxRadius = 50
@@ -77,12 +77,12 @@ function bhv_arena_flame_init(obj)
     end
     obj.oGraphYOffset = 30
 
-    obj.hitboxRadius = 50
+    obj.hitboxRadius = 75
     obj.hitboxHeight = 25
     obj.hitboxDownOffset = 25
 
-    obj.hurtboxRadius = 50
-    obj.hurtboxHeight = 25
+    obj.hurtboxRadius = 100
+    obj.hurtboxHeight = 50
 
     obj.oWallHitboxRadius = 100
     obj.oGravity = -400 / 100
@@ -149,7 +149,7 @@ function bhv_arena_flame_loop(obj)
     if target ~= nil then
         -- aim toward target
         local targetYaw = atan2s(target.pos.z - pos.z, target.pos.x - pos.x)
-        obj.oMoveAngleYaw = approach_s16_symmetric(obj.oMoveAngleYaw, targetYaw, 0x100)
+        obj.oMoveAngleYaw = approach_s16_symmetric(obj.oMoveAngleYaw, targetYaw, 0x110)
 
         -- jump
         local floorDiff = obj.oFloorHeight - obj.oPosY