From e5e81477e62bfaa3d219431934065dd498aeefac Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Wed, 13 Dec 2023 10:37:10 +0100 Subject: [PATCH] Fixed warnings in defaultDisableHavokOnLoad and _00E_Theriantrophist_Chymikum --- scripts/_00e_theriantrophist_chymikum.pex | Bin 3683 -> 3783 bytes scripts/defaultdisablehavokonload.pex | Bin 2792 -> 2828 bytes .../scripts/_00e_theriantrophist_chymikum.psc | 6 ++++-- source/scripts/defaultdisablehavokonload.psc | 6 ++++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/_00e_theriantrophist_chymikum.pex b/scripts/_00e_theriantrophist_chymikum.pex index c3cbc014b543a2c82d5d646f74a593ba3e58668d..3fc5b1aaa0affc27c933567cbfa32683de8b96af 100644 GIT binary patch literal 3783 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 diff --git a/scripts/defaultdisablehavokonload.pex b/scripts/defaultdisablehavokonload.pex index f37009085b6e190155bf99229a04360d5bd7b879..d9648f6a12a8bfa0b821957040c7df2ca228174f 100644 GIT binary patch literal 2828 zcmZux+g95~6x}j5#txWELP*l2Q4$i`Txc-HU?-F~+(HAGVA8JDmn>lowu(IRl4V%_ zyM92wp^yEDK6TINV$$G2V$V5qF8iD_`uDd#{~k%f0Dof88NmZvoLPN0*m8Q-sVhEM z7v6bY?t7NK*zGlu-?nY9@AvwyiGqmn;-w=^oZxO`Y=_2eW$a0p#&kcnD}qK~1p>KU zFYrP*UYDD~b!$OjHQN{sBOzaxwPxU4sKc4M{NMyiwd-4_n4y6u1Iv-Z-)vj5C2SOq zg)6L{IPrA47;QVYEhKI*Yv@F28cwGpY%RH6t-6jp*O?qye!x7nJbNw%m!5B9 zHt`>G)cX9;4{BXsTnHJMmNY$`wi&doz-(JRQyn8luV{-UbdAFC)hBzws&fu_fM+k$?@lH+=z@6ag?vMYOx8Y!ZuF_ zX4ka_!oT8Ur?%hN#?=4mV|||mF)y8hcX}LYm?5PaZ;m)8Z z+%wF4TYF4KnZ_l=;4MeB=ItEKIC}Lz!2FO*b>fEm!j{IJ4 zc}v{`4qRI2HFe;r+4{m_o%!s7jfsW`LgC4vD^S_#OD5pSkY$ggnr+bwixBtK<5rlx zu4p=E4hyULCom?(B^eQoHUgi0Mc$L!(hg-zI|SpNd@ov#40j7($MZ$d_oWIa%x2%` z)CZCGi1u>KwiJUE~Zs)3t8b9q8fR>va2WPaw_Px}@Jlq<1{OqwzBGN4}>n zx#NasN?N|6-(~$?jY%b74F&7`P+TTo6}7Ls_HZ9ntCD2=Izda(htvHBIey{{q|}F0 zfsq)bfeB1qv!*u*#((A%QNBb{ymlS-N~ z$XFwgWCUhna1*!GAz(I^jN&%o97RSJGbBHWyXrs|1>EE2yKpmw`!szJZf>$HlR7kQ zrdgRun4xBtQiC;3nJRJR>~U=$VR;GBBSpZYiiH;~;&-w@9wbd`c1D90?U;LIg!7TvW*@rppFGCR8lPiXoHI zH%v+ilhI*V11lVd6v_;%*koC=vVmDTEXR?!4{J(LP89T?zd|r7Qhw-K4e=_SuQA~Y z-BFnzgI#>U9xL?=pO1X@`J`~bcifr- z0|n-JprWWD;67{(!9k)3+47oPWs9+4NKQ5mued$r?Wgr&?3Vk`Ex}=;xZZ7U=r)Bq znH=#+;}hK<6E&hRd1m`byQRNRDo~E)ItIlJ19d_+h^RqzL+8P6Pe&u0x;FHGBe46C literal 2792 zcmZux+g95~6x}j51_x|HAh#xs(l(_H2@Ut4lz_R@0H&CV8rm z`VH-m^h5g8J)?_BgU6$_&pC7MXXf9Z|N3Vj2Lt?x;J3f=*b(P;*Ne8?&_46To_*MTVC)H{nyfY=_fj1$)a0HUDba3VpJAK|zKm>FieR&4%cgKpJ`tX< zLviZsaB-{QOUI2|U)ml9Tdv~>iAwG4SJ8-0#JLEBYzW-9tTQ3xaW~rUoBVKT2gq;u zzK6S(<+<`gn>@CIhz_;1cp-XMe&ArtvUG+zKrJFinXJ3*ws16OGCPwdq}jJK_Al>5 zPqQkCt@IpbSfL;?wSSW)&8wD>rk&KqSu?k`cdG9XPAzk%dQjiS_@~*R)DH*MP9QFY zj7(dazOIECwd}}j*`cY95wKlTj_JymO}j13^T2PLP2ZJGGi2Y~2FCth5Ud`sMCO$n zwP?%@&7?N;;l$PhaZa)4nYI`DW~kCohughSc;_hf3y7&3^KH4&wM-f!bpqNGZP zr5m-H9F;TSm}fn+ULgUq zDVW2+zKl@X59hbk?cF;vtb{S>+;z(R&cTCYW&*{@ipeq=PL!W(>q1g=0WoSM_3mIC> z&=Lwed>*2Vv7DjT8Ct<$yQk(1BYZ*>5Du>~%1J%8deUxlI&W7y9j~YF%YM7l^+J(m zHJ^fo6fCCTHKsnEfj~svK&lZCW}_SMt%#D2m)PcJQv}L)QiUb`aN5ovzhjtBoPnHr zNEH}JK^_>z*bVD8)KX^)p!U6M>ps*{qCudD&$IOePc*xz*k5Jq8J=nOkYYd2)-U@!r+$W)I8by@xfW*U?xP#AV_ECIn438=KJSN6j zlM2k3n5447Y7XEjzECU`>z6E)!4f^iz&!(B8<--c8#HR*8_LQ3_8J#?9*q;DexCKL zu#y$Lz)Njql;>yk`RCe7*}!xD?{X`8pkiQ}ITsKMrf-&)GkL0*e`Mf0ZTAH|yy{1k zGw`BdOeo_9tCR&-WKT!g(|PuD5laklnfo>O3U>|`zbfq_Bd`pN(~*@%NIH&?z{&*l zTk88o;&Qm}GKV*G`8{`@Q&ZvGjB;*bHzg*%s?E~gs&X_;$8SOQnt?Zjv`w@|@tTf< z^)Dxhbq7`yiRvj8s4DGO}1kT+t}gW<=*4or%Yu$LCbdvhPDq{{y`_Tt}AF@ zjA2y`tW&&CL~4VGQEjLLstpgcWP_1YvY|VrKzc;Y5p$t(JV$YzsP|6$*`)a6_H7mn zdf8Iu)l}@HU{^;(&Yl7V>K*jUpQi@T8rY?ruSC{&HI#>}z!7&X8OmYCdYJZ<;E=H% zDx+!~k5rwNV+xK^L4Vw8pTt|s#%<`j+Z>LQUaOHhHZVzJ$Eg?6@kkLIXM(s?*_BI1 tD#ttdqpC*yGam9L^0muSG;qRJ=TN`quWn$1X6vax(y>2+dM3Eh-+wI7{2KrO 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