From b67d6bc9a9a0e190e3d23e8e7bba436d333022c5 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Thu, 11 Aug 2022 19:28:57 +0200 Subject: [PATCH] Do not clear player alias in The Elixir since it's used later in a condition --- scripts/_00e_fs_nq05_playeralias.pex | Bin 5475 -> 5424 bytes source/scripts/_00e_fs_nq05_playeralias.psc | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/_00e_fs_nq05_playeralias.pex b/scripts/_00e_fs_nq05_playeralias.pex index e1916623b0b1153ee6d426d6a0f902bd085b4ce4..564dda67cb75a65723580589b883e3ed324ba9b8 100644 GIT binary patch literal 5424 zcmbVO*;d>}5G}C{W*Hc44BnDS%;GGz0Wa8!o!Gz(CWc`dz;SX;CSs-m1tDQcgAae@ zPso?#B~Lkd&P$$ht6QyEBoY!`i>a=zuBz@^UGiUVe)+YtgABs6_ow*>-K@;a6e`7X zrL;NosIuW$XTpE!*j8}wB&bqfp;q(ieo%MvloeXO_uh8%^gWGZt*Gn=755$1p2)Qp zuZ8p8Wf7J`D-?8T*$X`-_N==rt{qZ8enWBmvQ`r{8dQTVaqOL9*kASBnjPAnYdO?& zXv4;(?3UOUzHqBT=0=02sZ&0+eCmEz7eUC{-80wsys*OBKHEL;Ma>p&NS~Qz%SOvb zLYxYJ+p?WSukMD+j<;tya#{93%J5)Ydyb${(_Hhy!#D7@hNS%Jp)|YO=CRGD-Rpp9 zE?d51SLNa%(^N;jRVYeDw^a>2pT;Anh2xX(tmyg2jvc7Y^zKI^nrsUkZMi+*M4Oq4 z-fopM&8DM}sbnID)T5Tr?F*b7ebi!<2u2^b%qMfE5oyq}amqv_(@@*#Qh!s{G~MF6 z&9rI9bSXY`>M4gl7^UfA-K}!9<-@R+(5JkQa?c`ZDl?xN#ap&mb_UbS*|hH|*;0hh0Q`80YNMtBOy}%`)PhyZXvZOIY8pEV9LYL_ZjY{tbHbd7V+@KqD z6SxI@1bhtSf!h)j#Fzx`NPI?&&w;xV_lR*Hn3H%wjE4Ykqlf4NeHGyuJ)`Hq*T6Tx z3*aTNBvBxRB55qst5mGex4`QJR%w+=z^23&DU?ZLn|4yMOK*Vh5_n5*=?CCPi3%zF zL>d0o8#H$`~jK95NEBrLyxs&mYsFAchjk-T_=u*E#I_nNeDdPhYe+{gR4LbE7&F7`)w zGxQjvd3r)mF~eR>)crHO&!L-vudfa2Gw895Fl5ktB;SS-^88i2JU5s%=&3=YSn*9G zx&ft{7{SDgw29&KCI-%%xR#u_PFFYyBZ{T+ypP~Iy&lY%2F>E^O^)u;?}ztxkvG^tnNiQ@QGVr}9XY(;PdUI>+g?|Cwo)olczNbl`txI>t^>L2cVd z)x-rv=#2|ep)8_smQW-G6iX5B6wY=btpXNs)~bpYIRYWQC4;1V8~iM>vQI5$YFo=^ zK}~S^q)u@8q)u@8v`xe{f;8FTvO$-lL{O+4sfZ!2Q328|gI=K|Fi;tApyUEr@&c?Y zs0BF;8hc4DNJM~f6oE5NE=WXxRT1xstX_F|NPaw_$t5(|gk}tM#@x0xhi}mw2Jx|) z!{_M$jtjHbFk6Qdm(zO8!Uj8J?qCU@WrUTg?v$`dE()uRIV=<#dJTUI-pGpB zlwSGIq_Wx6HeIm!PTI)tMTfNMCTQO_w4F+e_9t)4K%C1uyp?#8a0HubQ&2(T05U2E zP)TgDp&?y?@-6&Rrd!&S^G)WWVm3Ek5W|fZ9wK6-=ZF~GwH9KKOGy#4jf@bHS0m5` zh=HplF*%j=woW=CrX?(rL)CCtWxR?XDELfdi8qK*bn}^Tr-TiYCvDP*nMx&QioZ+E z#Bkp5c41b@H^rjp*( zNk_!AgjH2jiiwF@S=^=?#3-*!%ryL>)VO`fI!hyFI+d8|c49bhc)Re8X-eYatqf6H GiTN9nt^rK| literal 5475 zcmbVO>slK}60I=^VQyM(25cwMuDQg?#s(YXSXn1)gd}7e>=+yQlKqrHYG90*!J`rW zc&xlZo+Q8aDfZW%s_q$GX5{rohe6%d)m3NuRCnt?mEZpuxI`A=bMWuVFLb@Sx>~3f z_o}-;uimRZZ`c>gf7Ed7=B=}4jYbOfy4UiXtwxq6RM@`t(Q&i%3(aG$svb70?gz|0 zlesp}MeyO03ibj!P;|NE1)gpWJ#)*h6VNEW19keSURQM**PR#Y)H_FawC1^WCvZI1 zZqU%N10Rw5W)hYX>jm*N(;EyPm8)KE0X8bGc9)e#_K{mTCsH)DvX?!u35b zNSJI!B=us?EWJj(lSVt%fmXU!s6SV_94#?@)iozhjnd|gXh<`l8(lLx@^^5fFT0## z+$n7`(UdrLNkf?)>NL3Pxr!bXTW*bOEgKx$LALqP32MixiJsHUdI#@SEyxBQx+>c| zQ#I$%QT1$7%6iyUA5B&71wKTk%efo}-RENT+=5%z!-GxLIHWWxR_2X)?xs3&T-}2i z8{uq~2Dxt7i@R$yP(~S>-W?j;^t?vcy-TTL!?UB|b(+IQD!b>Xe9ylq@ORN^1j?sL zY{GoY$Hw8kc%;f(GzJszJy}^wo!gC;qHC|t>e#Brwd^(n8(U4+Kdp4Hk*|W5@A49< zY)!{DD>7oAY}!r5(P`9n+F3I833sABOqpl0v>gWfWD9kj_uRmCTreLt3$Yfp?nJG- zQENSF-HTcqQR{xx`kvAUyI$ZNUeI(dcWS#w4OOomxMHfVCK=a~jNqV;wIfAW^?{YR z?x}o3p$cZoP5q+IxypN|XAKqLfScV@!T&OEIZZiE>ojSf?BN8iAwak`rY!D-1+ft} z?uQM$uU@|g(GslE)Q(q=@@j3(HSqF1rEp|hbcwG8ZVZHtL84_E1cn4@O4BfK85j|a zQ-}!)k)aTOp%7CvO*1qr(UEM8t{PmUYjhp>0{9a63dqu5fknX*F_wXwf^UfNEpSV4 zn;5IWUBNmr?g9KFLqxyPKMWqyL;4Z;3HT@Q2-u`NP!yC%W1B*h>2V^S&{JS1hF#jF z=fIxeC272(5c^a~#A|v3yp7=awcq_psV6jd^+t7$B3jH6QIlR>GyW~%!5QYqqLDe&+Ldr*7DX2Y7(@L< zZW$C})LEdvwcY0F23VWWlc?1wz%;BDw$y+WuCTXgg}#RICQJi!7JXyUx9G_}!+QN4 zgq#4^BZ1J4h#qOy1(zYw#`#4MSZWe)r0 zYn(~Z$GVCVfX0#FgE*;fm%kDZ#dlr;O(@o+o&o z;@QFT8*=Xo5W`Gq+9N>jb9AJrh z24H#K4vy^{6%9CzWrXTO5DeKaUk~e~0D47vxhacE78TG%X*@=!Osizm&7MUuBr7M-B+Be)Nhnl68GqWf z9J(^!I2WDM>K0}i?~VvY7>R6z!G7!#23(9VPrwKnA!~bUe^MBPiVHKNNk0im8)3TA z>Z;+i+BuIeR6MVVRD4?)EjO5@s<`n8jXUm^Y$*wlEze%$cd*k-79023eDYnMZQe zSHe+-UDrpLok*DWRrN_>5UMSV-tQL8Y0^6(X(LQmT99iWW!SRjD2tA%wlF#>3$uc_ zn8e42)LD`+D~ZCa^a{hg{~uvGNPPZLhOFJf;D=hDd-o;o-86o?uhBm4(u%ovU*pbw zgXb-5YoM%uW4+?FAS~d%MbhT`743bj%RZ0s{aQ)7Un_bbe!rT5`2A`I;`gf=h~KXj z@a%KHf)n4bpo*fbglvaE>a|5b;_D5ww-Df+Tt#oWo0ic9ZZ5%tg-mtc4G7A2!`mpR m%<3OhR!9dGahCf8<#X-NFwHR2#XdoKPyQLEa~yOf7WBWxbpmq$ diff --git a/source/scripts/_00e_fs_nq05_playeralias.psc b/source/scripts/_00e_fs_nq05_playeralias.psc index a785a1ac..2c91898a 100644 --- a/source/scripts/_00e_fs_nq05_playeralias.psc +++ b/source/scripts/_00e_fs_nq05_playeralias.psc @@ -24,12 +24,11 @@ EndEvent Event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akSourceContainer) If FS_NQ05.GetCurrentStageID() != 35 - AddInventoryEventFilter(_00E_EmptyFormlist) ; in case clearing fails + AddInventoryEventFilter(_00E_EmptyFormlist) RemoveInventoryEventFilter(Garlic) RemoveInventoryEventFilter(MothWingMonarch) RemoveInventoryEventFilter(Vynroot) RemoveInventoryEventFilter(SkeeverTail) - Self.Clear() return endif @@ -57,13 +56,12 @@ EndEvent Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer) - If FS_NQ05.GetStage() != 35 - AddInventoryEventFilter(_00E_EmptyFormlist) ; in case clearing fails + If FS_NQ05.GetCurrentStageID() != 35 + AddInventoryEventFilter(_00E_EmptyFormlist) RemoveInventoryEventFilter(Garlic) RemoveInventoryEventFilter(MothWingMonarch) RemoveInventoryEventFilter(Vynroot) RemoveInventoryEventFilter(SkeeverTail) - Self.Clear() return endif