mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2024-12-25 06:05:45 +00:00
Code Issues Releases Wiki Activity

additional seahorse/Li spirit form/riding fix.

Browse source 
This patch enables movement after going into spirit form while hugged,
and fixes getting off a seahorse if returning near an actual spirit crystal.
This commit is contained in:
fgenesis 2011-11-21 02:01:29 +01:00
parent 47c31660ca
commit ff195c6b16
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
game_scripts/scripts/entities/li.lua
View file

@ -631,6 +631,13 @@ function shiftWorlds(me, old, new)
entity_setPosition(me, x+1, y+1)
]]--
end
-- resuming the hug after spirit return is not easily possible,
-- as the game has additional code that repositions Li then.
-- so we just end the hug; this allows moving in spirit form. -- FG
if entity_isState(me, STATE_HUG) then
endHug(me)
end
end
function song(me, song)

13
game_scripts/scripts/entities/seahorsecommon.lua
View file

@ -571,8 +571,17 @@ function shiftWorlds(me, old, new)
entity_setRiding(v.n, 0)
cam_toEntity(v.n)
elseif new == WT_NORMAL then
entity_setRiding(v.n, me)
cam_toEntity(me)
if entity_isEntityInRange(me, v.n, 64) then
entity_setRiding(v.n, me)
cam_toEntity(me)
else
overrideZoom(0)
v.riding = false
entity_stopAllAnimations(v.n)
entity_idle(v.n)
entity_setRiding(v.n, 0)
entity_setMaxSpeedLerp(me, 1, 1)
end
end
end
end