etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 13:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Arena: ladder update and typo fix

Browse source 
the only behavior param now is ladder height
ladders' orientation (yaw) is now simply set by the object's yaw
when adding ladders in fast64, the cone empty is recommended
This commit is contained in:
MysterD 2023-06-01 13:00:42 -07:00
parent 7136e3df9d
commit da0dac728e
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mods/arena/arena-ladder.lua
View file

@ -1,20 +1,17 @@
ACT_LADDER = allocate_mario_action(ACT_GROUP_AIRBORNE | ACT_FLAG_AIR) ACT_LADDER = allocate_mario_action(ACT_GROUP_AIRBORNE | ACT_FLAG_AIR)
-- behavior params: -- behavior params:
-- ladder height|ladder orientation (0..3) -- ladder height
-- ex: 13881 <-- -- ex: 1388
-- height^^|| orientation -- object yaw = ladder yaw
-- 1388 .. 1
local sLadderClimb = 0 local sLadderClimb = 0
---@param obj Object ---@param obj Object
function bhv_arena_ladder_init(obj) function bhv_arena_ladder_init(obj)
obj.hitboxRadius = 40 obj.hitboxRadius = 40
obj.hitboxHeight = math.floor(obj.oBehParams * 0.1) obj.hitboxHeight = obj.oBehParams
obj.oFaceAngleYaw = (obj.oBehParams - math.floor(obj.oBehParams * 0.1) * 10) * 16384 - 32768
end end
id_bhvArenaLadder = hook_behavior(nil, OBJ_LIST_LEVEL, true, bhv_arena_ladder_init, nil) id_bhvArenaLadder = hook_behavior(nil, OBJ_LIST_LEVEL, true, bhv_arena_ladder_init, nil)
@ -23,14 +20,15 @@ id_bhvArenaLadder = hook_behavior(nil, OBJ_LIST_LEVEL, true, bhv_arena_ladder_in
function mario_check_for_ladder(m) function mario_check_for_ladder(m)
local ladder = obj_get_nearest_object_with_behavior_id(m.marioObj, id_bhvArenaLadder) local ladder = obj_get_nearest_object_with_behavior_id(m.marioObj, id_bhvArenaLadder)
if ladder == nil then return end if ladder == nil then return end
if m.action & ACT_FLAG_ATTACKING ~= 0 and lateral_dist_between_objects(m.marioObj, ladder) < ladder.hitboxRadius + m.marioObj.hitboxRadius and m.pos.y < ladder.oPosY + ladder.hitboxHeight and m.pos.y > ladder.oPosY then if m.action & ACT_FLAG_ATTACKING ~= 0 and lateral_dist_between_objects(m.marioObj, ladder) < ladder.hitboxRadius + m.marioObj.hitboxRadius and m.pos.y < ladder.oPosY + ladder.hitboxHeight and m.pos.y + m.marioObj.hitboxHeight > ladder.oPosY then
set_mario_action(m, ACT_LADDER, 0) set_mario_action(m, ACT_LADDER, 0)
gMarioStateExtras[m.playerIndex].ladder = ladder
end end
end end
---@param m MarioState ---@param m MarioState
function act_ladder(m) function act_ladder(m)
local ladder = obj_get_nearest_object_with_behavior_id(m.marioObj, id_bhvArenaLadder) local ladder = gMarioStateExtras[m.playerIndex].ladder
m.vel.x = 0 m.vel.x = 0
m.vel.y = 0 m.vel.y = 0
@ -67,6 +65,7 @@ function act_ladder(m)
if (m.input & (INPUT_A_PRESSED | INPUT_B_PRESSED)) ~= 0 then if (m.input & (INPUT_A_PRESSED | INPUT_B_PRESSED)) ~= 0 then
set_mario_action(m,ACT_FREEFALL,0) set_mario_action(m,ACT_FREEFALL,0)
m.vel.y = m.controller.rawStickY * 0.2 m.vel.y = m.controller.rawStickY * 0.2
gMarioStateExtras[m.playerIndex].ladder = nil
end end
end end

3
mods/arena/arena-player.lua
View file

@ -15,6 +15,7 @@ for i = 0, (MAX_PLAYERS - 1) do
e.prevHurtCounter = 0 e.prevHurtCounter = 0
e.levelTimer = 0 e.levelTimer = 0
e.levelTimerLevel = 0 e.levelTimerLevel = 0
e.ladder = nil
local s = gPlayerSyncTable[i] local s = gPlayerSyncTable[i]
s.item = ITEM_NONE s.item = ITEM_NONE
@ -386,7 +387,7 @@ function mario_local_update(m)
-- prevent water heal -- prevent water heal
if m.health >= 0x100 then if m.health >= 0x100 then
if m.healthCounter == 0 and m.hurtCounter == 0 then if m.healCounter == 0 and m.hurtCounter == 0 then
if ((m.action & ACT_FLAG_SWIMMING ~= 0) and (m.action & ACT_FLAG_INTANGIBLE == 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 if ((m.pos.y >= (m.waterLevel - 140)) and not (m.area.terrainType & TERRAIN_SNOW ~= 0)) then
m.health = m.health - 0x1A m.health = m.health - 0x1A