mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2026-04-26 12:01:43 +00:00
This change allows custom attacking actions to be able to break star road's breakable windows (#1090)
Some checks failed
Build coop / build-windows-directx (push) Has been cancelled
Build coop / build-macos-arm (push) Has been cancelled
Build coop / build-macos-intel (push) Has been cancelled
Build coop / build-linux (push) Has been cancelled
Build coop / build-steamos (push) Has been cancelled
Build coop / build-windows-opengl (push) Has been cancelled
Some checks failed
Build coop / build-windows-directx (push) Has been cancelled
Build coop / build-macos-arm (push) Has been cancelled
Build coop / build-macos-intel (push) Has been cancelled
Build coop / build-linux (push) Has been cancelled
Build coop / build-steamos (push) Has been cancelled
Build coop / build-windows-opengl (push) Has been cancelled
Before this commit custom characters like the sonic in this pull request https://github.com/coop-deluxe/sm64coopdx/pull/1081 can't break some star road windows due to giving up vanilla actions. This pull request remedies that by allowing any custom attacking action to be used in place of vanilla actions for breaking said windows.
This commit is contained in:
parent
e4aad9710e
commit
d91b7af020
1 changed files with 4 additions and 1 deletions
|
|
@ -52,6 +52,9 @@ function check_mario_attacking(obj, mario)
|
|||
if mario.action == ACT_WALL_KICK_AIR then
|
||||
return 2
|
||||
end
|
||||
if (mario.action & ACT_FLAG_CUSTOM_ACTION ~= 0) and (mario.action & ACT_FLAG_ATTACKING ~= 0) then
|
||||
return 2
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -121,4 +124,4 @@ function object_drop_to_floor(obj)
|
|||
local floorHeight = find_floor_height(x, y + 200, z)
|
||||
obj.oPosY = floorHeight
|
||||
obj.oMoveFlags = (obj.oMoveFlags | OBJ_MOVE_ON_GROUND)
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue