Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Arena balance tweaks

This commit is contained in:
MysterD 2023-06-07 23:50:53 -07:00
parent 05631ee6f2
commit 007a77ff40
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/arena/arena-proj-bobomb.lua
View File

@ -94,7 +94,7 @@ function bhv_arena_bobomb_thrown_loop(obj)
for i = 0, MAX_PLAYERS - 1 do for i = 0, MAX_PLAYERS - 1 do
local m = gMarioStates[i] local m = gMarioStates[i]
if active_player(m) and global_index_hurts_mario_state(obj.oArenaBobombGlobalOwner, m) and not is_invuln_or_intang(m) then if active_player(m) and global_index_hurts_mario_state(obj.oArenaBobombGlobalOwner, m) and not is_invuln_or_intang(m) then
if bhv_arena_bobomb_intersects_player(obj, m, a, 100) then if bhv_arena_bobomb_intersects_player(obj, m, a, 130) then
bhv_arena_bobomb_expode(obj, (i == 0)) bhv_arena_bobomb_expode(obj, (i == 0))
return return
end end

2
mods/arena/arena-proj-cannon-ball.lua
View File

@ -43,7 +43,7 @@ function bhv_arena_cannon_ball_loop(obj)
end end
local m = gMarioStates[0] local m = gMarioStates[0]
if global_index_hurts_mario_state(obj.oArenaCannonBallGlobalOwner, m) then if global_index_hurts_mario_state(obj.oArenaCannonBallGlobalOwner, m) and not is_invuln_or_intang(m) then
local b = { x = a.x + dir.x / 2, y = a.y + dir.y / 2, z = a.z + dir.z / 2 } local b = { x = a.x + dir.x / 2, y = a.y + dir.y / 2, z = a.z + dir.z / 2 }
if bhv_arena_cannon_ball_intersects_local(obj, a) or bhv_arena_cannon_ball_intersects_local(obj, b) then if bhv_arena_cannon_ball_intersects_local(obj, a) or bhv_arena_cannon_ball_intersects_local(obj, b) then
if obj.oArenaCannonBallDamages ~= 0 then if obj.oArenaCannonBallDamages ~= 0 then