diff --git a/scripts/_00e_theriantrophist_chymikum.pex b/scripts/_00e_theriantrophist_chymikum.pex index c3cbc014..3fc5b1aa 100644 Binary files a/scripts/_00e_theriantrophist_chymikum.pex and b/scripts/_00e_theriantrophist_chymikum.pex differ diff --git a/scripts/defaultdisablehavokonload.pex b/scripts/defaultdisablehavokonload.pex index f3700908..d9648f6a 100644 Binary files a/scripts/defaultdisablehavokonload.pex and b/scripts/defaultdisablehavokonload.pex differ diff --git a/source/scripts/_00e_theriantrophist_chymikum.psc b/source/scripts/_00e_theriantrophist_chymikum.psc index fded1e08..6f78f0be 100644 --- a/source/scripts/_00e_theriantrophist_chymikum.psc +++ b/source/scripts/_00e_theriantrophist_chymikum.psc @@ -49,8 +49,10 @@ Event OnEffectFinish(Actor akTarget, Actor akCaster) OnChymikumEffectFinish(akTarget) Endif - Self.Dispel() - + if akTarget.HasMagicEffect(GetBaseObject()) + Dispel() + endif + Endevent Function OnWolfFormStart() diff --git a/source/scripts/defaultdisablehavokonload.psc b/source/scripts/defaultdisablehavokonload.psc index 738e0fa4..37198f79 100644 --- a/source/scripts/defaultdisablehavokonload.psc +++ b/source/scripts/defaultdisablehavokonload.psc @@ -64,7 +64,9 @@ Function ReleaseToHavok() If myLink && (myLink.beenSimmed == False) myLink.ReleaseToHavok() EndIf - SetMotionType(Motion_Dynamic, True) - Self.ApplyHavokImpulse(0, 0, 1, 5) + if Is3DLoaded() ; prevent Papyrus errors on a taken object + SetMotionType(Motion_Dynamic, True) + Self.ApplyHavokImpulse(0, 0, 1, 5) + endif ; Debug.Trace("Released Havok.") EndFunction