From 906c698b8aee0c8ce59cdbf29645d7e5e3848c47 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 26 Oct 2021 04:19:18 +0200 Subject: [PATCH] Refactored ingredient tracking in The Elixir: removed scripts from ingredients, moved logic to player alias in FS_NQ05, replaced custom globals tracking with ModObjectiveGlobal, automatically toggling objective status --- ...FS_NQ5 ingredients, added playerevents.esp | Bin 0 -> 10330 bytes scripts/_00e_fs_nq05_functions.pex | Bin 7969 -> 8097 bytes scripts/_00e_fs_nq05_garlicscript.pex | Bin 1403 -> 750 bytes scripts/_00e_fs_nq05_monarchscript.pex | Bin 1441 -> 788 bytes scripts/_00e_fs_nq05_playeralias.pex | Bin 0 -> 3196 bytes scripts/_00e_fs_nq05_skeeverscript.pex | Bin 1425 -> 772 bytes scripts/_00e_fs_nq05_vynrootscript.pex | Bin 1409 -> 756 bytes source/scripts/_00e_fs_nq05_functions.psc | 22 +++-- source/scripts/_00e_fs_nq05_garlicscript.psc | 19 +--- source/scripts/_00e_fs_nq05_monarchscript.psc | 19 +--- source/scripts/_00e_fs_nq05_playeralias.psc | 90 ++++++++++++++++++ source/scripts/_00e_fs_nq05_skeeverscript.psc | 19 +--- source/scripts/_00e_fs_nq05_vynrootscript.psc | 19 +--- 13 files changed, 106 insertions(+), 82 deletions(-) create mode 100644 Removed scripts from FS_NQ5 ingredients, added playerevents.esp create mode 100644 scripts/_00e_fs_nq05_playeralias.pex create mode 100644 source/scripts/_00e_fs_nq05_playeralias.psc diff --git a/Removed scripts from FS_NQ5 ingredients, added playerevents.esp b/Removed scripts from FS_NQ5 ingredients, added playerevents.esp new file mode 100644 index 0000000000000000000000000000000000000000..f60c8ac78a11106e9d5b8e25dc3bbd929c15236e GIT binary patch literal 10330 zcmds7OK==V8E&m*%kd*Iv2idEyNMmYkR54d$2PGYue6f0(ZjNKZ6_`lOYd&4c1p7| zn|WB?T;d8<93UqSP$5vH!hwRS9H`;~2j0XE#8h!3sS1_csDxZd0SO6+@9*x}oms8y z4S@q0m!;8k|9}7g_dmO53gh`h-(<;a5Pv>2o}JskzVYsfxG=~?xI(yy~@rjS|N;-iPpH7X*ID-3fs?o^~FY<_@GxZb=Q1k&O8 z!1XNYccID66wddvK9Xkc-0ZQ{jOAud&(Vq(KdaZJzqiu_T=z_`Qoje;MmC&(Z1dFie-t-AX+`%JfnY!T{kGKxEG_EQ zljAeF!diAh6SMJ&T(+OBd2 zlQ=TA4gU$XQG?oRd&t^Yi`}MB+r*~bpmxD>=BHgpc;%Xb@13Q;F3~)iP4I1Hk4oEi z7x`!iD|%JC$%%+{qDe?TwQHS1b3Yri)$B_-XWo+)OA@rvdP8Zm;z}65w?8CYkAD65 z8-D)FuSfUV4axR5UV7<-Mz)_s#ibGY~EME&GAJcFNn>oCx@| z6oCPfc#&K7w_I{}R}f>YS9H<~sXx3(pnYNb)l1)TUVSRMj{`VmT=QgezEVpB4I>9{p}|% z3`X}4T>Hwo=>Aa^;6J{$is?}Q5$-gegu;!NB0M)MO(NZw<3ht4mlvLEhx(~ghRlqe zh-0RP+K&9^BW-8ZbZan!5@-D$#?GG07lkzJg4iv>wPKuJqYb7ajs<(`Qpsk zp~LL_bSC@E`qg-zVp~~pXh;^Te$jbs=y0(bI_1D}9iQ!GTOxvDzAPPCaLYBMgg%&Y zY3cIosni{<@k~9mWf170Gg!AZ^e}>=;<|?Fx7YeoTO+Dz%R{OuxRq()Ekt}@z>K?- zGbTe%P%R1T@rggf#GNGjc+sd;j0MY>8#=*h+bs!O3$^i2snq6(uh!?Zn^_c1J=}Pk zh7;W8!505a=+}fZ53dWXvL4@q@r^BF z6qrEjfg1p9J)1&Jvi&C3tn0_mt?NTULgUkv-khxJhg*;!23R7re+Tkb{1!aXXvZ&) zi&TtMPPbIvjqw&~aoo19Sdl+JfT8V4V0H7g4A=F*^>!GgF0-QP&kEm{6)o&B2)l-9 zchpaIfom5hOzY9>(4-^iCy{a@k$$R%AFH;K-_Y>TaQSGu3Ya#sjBN?OsI8^=tx_2^ zIiS3~PYrxRE0-zPEFfQ}9%$SVB|8%Si*7#xT64_@VNE5benq;$Jl3`$+1Di2ikT;s zAZSCO(|yFKox27SjA9m9s|Hfr*k;xRfe9)cxca(|u4faTm?ssBBZp`8%v(<#KK4|v zQ%86K~vP^IUo>Fd2tJv8!@o~Ndd^g4AUO?@j} zx5nzo_w~$MPdzmBwO*%=9G&cW>Y*olo_c?#=cyx3uT#?_)Z6Q%MQvptQ`xZHRyI`C z5tLGqT<_@IjOuhvO-GmhX@xFmAS!*Dn7ZBG>&t)8Pkg{;^Fy^2v=d*?3N^`9#`ahi z`w==o*rKdQr!!{@r>9U*P%HHvwLJQcT3vld9m>R10mnZxvLv0yLg@#W*v$AN*fZp2 zvX9UqOv>C*xS!2u3os;|4}FW}xZ|SNkQFX?LpL|va`<-Vjd z1?lsu>+zbj8|p@I+r111t|Jff92a%&hYj$;qrl~LDFa@!>Kybn3#7uU(+UC9p1{5I zd_Lw1Kj7eLp3i~w%$0*iX4;EsJt(oqq<>jqM+~LcqpT!>W!thxGlLk})uylRn-=HMR0PXnS5aHOn2@C0;ViAg0- zE~+Wo2oXqB!xJD;^-DaU(j7zXNuWl&6g)CADalPD(NhRy!2_&-ZjHEPQy6Gb_!Ke9 zo87u{cw@swf%#g`k`)Z{hV*Kp;VU9?IZpAOZW*b z>stZsJ-8#UD8a~Is@Pp4>y~K_jE7@6?!%nUyo8jNPoYYdDM=jm#r$pFRd&+xtb`_a z_1(}b%SbrNK`~igQNh;1ybK8R3L2$7ej>6EC-4=YFJOz!t$M?=d?X1nuCilE_^N|e zvgoPKo&Z3>ryZXxAe?61C7;PdSKz$pa{(xQYu@oGA_)RY7Sp2QNZ*fXXwZiJk}zpA z8%t@SBZa9OPFRB~bK(It!7)glha;&}VO)e(G6|vr9jrj|dXtx3rz}0lt0IG3$Ke!T zLY=0N7A@?mqHfvEgM8MwPAoqd-=T1^@WUWj4e^{{g4rdWYDA0-HRKck$Yr%E%R!_i z_0b8Xs9Dnw`luxA?#mfh)sYYr4v8Chq5zZ^knB}9Po$Lt9A27(!boXkNR|2}GE+M} zJ5)H}5iL5nHZ~Z%B)}6{MVl*f43(Uu=ULcakR>8Yw#fEMOX7eNOuYkZ9=n|B$GS&7i3-YJ15b;&Uoc?&L5 zu@o9Ar6k2MB9r;xC5Tj&ekk#(d`^?AqKsf)mc>;*rmWJMmT3r@yVeFTgc{6$L(0!Xlc7$Tw(X6pN3O$Tlj4b_)#MNTH*&eWacLYJlW;T{tAK z%4n{0*+P&Xv7F~)M)$Ee#Nof_1XqP4GZZ$+RiQc$|Mu)s2N^;w(cGRaxOgij{**^DwYkSI+ zx^ahv7PNDyK8yUOy_2w_GMx_{UXb;Mjb!>ibOSmdG5BgXpu?4z8@zH;H=uTb?CD!b z`>pz1@?6>}ML{0dq|l-4BGn^#1w9N3CWSsF2JABME2J+6P+U~-Bw98TD<9g!&Yl^4 zIK^;YrC#YlZ#ILwJ#50lnz1_Tq8XwVq|Tf0TfKkt0-zNC8bUL}seFRj4mOwErm5I& zrwXRY@VX;Gb`L8Edm*_)E4j#@M5#BIU63RpNX1 z?=#Zv>fkyXamCv=6np%L*qJVJ?{WQt?L^|WS?rBf>}3DseZ$c@_jat4i`JP}pLO)M z%Cc7nu?2Q_EKrITXrkJnVL^9?L`h#ZECMWjWI-t1RIQcYIK@_mQzZ;M8LezyA@!!) z^7l=#CH8hKk!I6$jAHy4%|8XIYBOjfN@^vKQk1=wOVf!RUD`L(9eg*j3(>As^ERH? zuZaxRkq#<&I7JmLtGA50J%%J|&uOTRcTjEXTnn2;y-Vx5Xr_bwQw;BMX-AG#spOz| zVe5owu0VuxflNJffP3DsviSZ=}#H`ND23WdK} z`l6Xfa8u&Bi%n8C)S$+8#b$bCIa?BuLN8$lBa5MOI;i%r^LX9batq3?x;s@MjkR8= zcchn$^4{CPJ2RCpXj5mV=#wk6ws!BY-boWC=K2}Ee#=bFj`g$ezLiRyFN{q_MB~|r z2`NrY@a2_y&p#ZKRdd+^F5PMA`vpyFUV$0fwgmLDvO6uAE52^r!}Yo^u1HH-5bYYK z-qbCVc<;N6bzgOjp&T$TT9=X1No99Z`UHy>9Y8gqPY(1xWEp&6`IIrn)~+O5S}^wN#1_IrlI?^fY(~2yY4Gfhn3{{Ep-!AMc7z-2v8&!2RKvJsLrwGLReYYf`9lb!Jl zhwV#8NV=$1owVPu?7338G#er5rk0~6|L}UzV7gJwoLML^&GUAtU^27o7A5a4!zR>} z$sAuSIkxTP7IcRi%+jo56ilP!(M_35#AlNy4P(J@rgYO9u*)S+7?*EbIm-&$|ieqkx=`m(|b0=V_F<8>c z&&BoG7?U>Q=+hxN>jHGP?9S<>Sr)`*o=a-XWQ2x%r6_abw(CJ+XKG?-nB%quT&C>& z9KxmInP8fT4=0Q>#=LNKV%oM(lF~KD)O0<=EQNGkoym+Kj1cASxbC_}fy-`FvK@WC zfPjsw%l+Uh#&KI>iVPb?-7?0?#c7KflG7wzgjIo>GZ{aZ{iDYHD-tj+Qd%f2Ewnz+ zGB;pbmg%y3({G>V8)3ePVMcVvGV^gywg)VPSNw7jGLW*Lf7&U#5JD?U9YNXzmI62y zLtLrr198e39I-|r?$FDwSN1~|*&8-;r3mig3=mi1gnYFslerVAY`Kf@caeiydBwe- z)dW>;K^IDTPPZY@L|A0GbsH`V&_MAe5;W8#T<0wwK?SwumtXvAE$ zShfsL1aMM!il`?wLJ?XmD~=2VmMYX7vooy-orv1xo=AWwR^c$F6(O6^b#iA=!@6i| zB%(rcLSaSqL2Og4?>njyzM)#bz|r+S_jpWEvqboLM;m>BFhbmXv@U{`nEK%#Xdfx{v?(HL>9s~I9aXm^sy40h4HL_}K&UJ+ zLHGzlb^XNbE$&HLCG8zt0F=1PMsrh}$)G&UcT!@;c8YSDqWVmR;g6$V@JZ5?=(lZ) z8YYY)daJ|OM)il?p%Uu`3RF92y1Xx_6CBfEd8eH}No_0{m zyHdk?vMHMqqo!q1jbKK7vW;u^=5(*!J!N|NIm5-ublXLZY4>a_jdph)&ESk_6xvOdd&3addC`EE+#? zl2i{Rhb>$80>D06F{~G$cfSQvsx5n_WqOO0IH8*!T%~aR3|}|N`&q>?-78t8`{b;v zGnl1?AoDs~RR_55``MPK*==L(~$) z?B}DG`Z%bLpyWY1#258M4K$1~f^i2OrXv`mbSFnP5ExI;B*qjSqvIU7f^GjH{fI9b z8T&j&fe$9JiGl9JIEi6#s+CMThg|ZgObc|1PSYYsG&96mdH~}=jECr9dW0id7?a27 zae4ydNe)`YDZx6!y-4AR|-Y(G+9t0YSy z7Y5{_A88SAJA@3`ATjHaEP>E&I-wQ^>3d2}mcFkRYv~@vEki$0i%#TQAm<2DFIe=^ zy=t+Ea%!=SeykQZlMY{M!Uk!YR+!t7yTRdlki>!38_7^)`)EcTZU@aO%pRIUweVSw zlBvjgQ3C=+x1$&Y*4c}?Fe3L1Q&Exaq>>`rOg6&RXT6)|71ZFbBX%Ly=CP25HO^>`D0Ls2v5VOlRmPRJT&21&wy&=d?!M$l{+OZ8chC^*jL_ z`_+UvX|zkDGYm#+{7C}vpL00h16l#t=Q9CdHD`h=A*4zbSK%yE0rU@ObgNHa zl|(@U=s^xT%eLbGdk-a{JRTq(RthFH8scE}N@{}SpwA8@8HMFDPV$K2qA{*m%PoBU z3yn6Z6Mz7KLkfWVu1vpV8o@mDD|!@fX47g={#v8Qd`fE4=yBiyeIf+KH4rj|*jWXd z=+XKr>HVbAo84t0Hq~5#r|4;V23D;ByWeQkFBO4|v@ zg_vQ-@A+|_;htr$QECe-Q%lc5k>~Mu4$8cMdUYPZ7x2fdv;_kb-`E5C%q6R6>41w)Vf$nt>$l|7Nq%VVa8-}<`vYE z*7^`904X~`KpMB!z(25^6c9j|&x+`R(SMNxD9 zpix?*SGgGggfvu?{W3&lMcJtUl55pcuGlQpe=V@;ZGgS5QA*|l3QS1x8hXQ5{7v*~ zZ$a_5v3>{2Z-$sR7#CI`{;1JrsQ|z+)cWO7JC;ZFhENdkCl!#@OzgI#sHSoF_GREZ zmVtLLc+66XgI9Roy{XY4ME@C%(C97S18=g^VTqr&IS3Sg;mWhCjtoH1dxx62`(_1F|cU#Qr@Tlv?6>Kz_Da^P>e0|rpMnz zXeT1azvP$mTKN7FJLUg`9d7qGpqgLeszmR#ZI#X&6N?@4G)awaUS@|RVfp!<+JR`q zN6Dl3`UxIw9WG*Ojq3kC@|_(!3H{&KXc%13{U8sx(Gmc%Lm_wA1qFgp5PYBrsuckc zAFBIN!#3?1Y7R>ixARA+EFVKE>v=v2-Q?i^5tGFn@HYjos-nLG1MJ6vblIFi`p3R{ z*z^yzsY0$F`1btWF@;+s(m%8&)*rGAKs~X>vqUv8p;beyV zjP1Mu(mq$!3|+=&fQT!f6EKTj2DAxxJZAXtj;M0Q_Y7-KuV}=wH){AR{?P@VRj_Zu zvr6(!cviJ4RKo|uT_f9YrYMb7!WLtPDxNf*WLI!3`wiT=lv=A5*N43hc6%ze7{7TU^~)6Dvz}I Y!WRrQaIb5$MOFwbQ3r$kXRZAI0klLd&j0`b literal 7969 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 literal 1403 zcmbtS*-{fh6g{1VBoGos_B8?lT)?2>GLJx5$||-fKKPItW;&r|=#DcTD8I^I@Jsv< zpS;~O0j*NYD*IL@_nf=+y|=%=|N1SR0t1~7-7hPcY1V4>=1!w|a9rDH?z&+hyoMKw zj$Z3T9&$&n4uyAt@^-!P=I!Cp>SlfK)p2bP>zMdsC?(JDa^29b<|ynctzvcPP;M!y zT_Jh6b?(YG_c7op=?g8CbOZFA3*YAw<-@a&+|wt##X~MVjz!1$O|>o6m3lW&XKv8E zazm8bRwq@sX8}jqagGA_GY?PdJJuoVdRm1jI!@fFCHsYJhujxjY79C~Zx$wD_EVQf z8ikuI$R%dX{{24aiz}e7K?9U+EbnxsXWFdjb5~bFuDhX(2=I#64XI0AiR`>`juTHS zbD$(g$-Ow>*EeG`_%QHqF}Z7g*{LDDPxnvIIx?F|1wHt*r#$N^&yi`V@UjOtklhKC zOPxB7sd`GiC#hcal$X7owmFKl-F+%+7l3?&>r*%Aa!kGJ__Xt_xS@SX9ntpU4Pk`b z;=PJ1zAd7TS&fg^zYZq47TP=KW-=nGDEkg7TG>HG9qx&i;C?cyyyVyMtooI#OFx-g z#Df-!N^bJDke2Jc_hqE%Z8D_H`!|Y#R>=V4$Xdz4NIsDQ`bmmb1`$gMWh*IU8Tw2f zI;nYzvKoCe6kRYZD0m=NiWF^+3AZPMJ7lymIr6(pd;&@sqWA>lagRb1P$b3NJB4A4 z#A(czO)`v9*|FGS6otC*T6t8xbIvg&c>y2Acg_>xp#QB zbFz;bs=n)n{`J_8?%cXRjH6)G9gMppaVu%eYKPL3fecY-$1={P-HoH3kb<%|FbAU7 z3!~(9EBS6FADihet603{`NyYjJw0MAZhCSgqJFxrZCkw2P&?9R)=9ru?Xeg~dtqNh zivC^NghqceRh7`GQfDwsWjuTDFei$^0EeY03YgA?jbbiJn8}5KSxTvCP6G~c_K;Z| zCCpKLV%eCdC6lH=B0EIG0v7W(^b literal 1441 zcmbtT*-{fh6g^E6vJetQHbr4XHc>FBxXdG%0A;aA6d!y@4KqzLGIYn84wQeQf8i(i zC4Puc-tL~@Qe~A@&aIib=WgeA-|p{kzkbUMfPtQOy)U0J-Ky2(HGCO+~9o{B^N6xA2?=F8Xn2P+%(?PsrQ+gQVmzvoiQJ zBl}`g3gv}@$D18bw0VHRP8bASV91vu2vtZuM5yi`zvsR>X;u7zbO zHh4P}7A^kXK+IJy7Mh6q;hmzg69O|Fi-sK+t&rW?@V z+q7-(2IS;{g*^vzOs(bg_u$SP&ZHjhp>PZn25H92`yaFrrcP{IgB zr=W~$R4fGrQgq)LjAG1|VHn2*87Ik-c&N%7X zI9_3xW2lgCo?)5*dFHjJK%NDL5*1mYfHaYjk@O{kCP kjKwTGqs0gV@EZ1($y) z-;poLhvX@zXLf`xQ02I?r*^kz`b>9EPxt)u?ytWGuD}5w@1yqsw`#>=wYI%id--c| zwf4H{eNs`W>3gk5C#^bCTmG?!%Vvp#e1Pm-$dDra<^+gyTzVm~F7i35E!%BD>#5>LKz1OUrc@c64TBhiG@0$wOTzBtCsWTP* z=J|$_+Po?3d6XUHs-oEp%TjAhf~#xaldDAM>rQ4 zNKEU!jJmFgM~|jlw`cEqI&CPJ`^+q1q$2=i5`V}fkt5&Z1h=~k_ir6DU4#zn9oxgV zU8KG=BfS?#JQvJup9Xa)g+hGj#f3=4r%}-2Ko#nz5$hr@v~;ayc(7VXy$l0|tanuQ zT1sjSsr@iI#)#+3NC$y|T^@GcJCd1pfg%6u{U53xcT9LkTRgK$7{s0*s0j4J6(>)u zu#QwY44W7-^NYo{wAhxGFzmV#)LRyTB`#xdyBT_Mdt$}*&4I$S>4@FnjQb0tPgVJE z`^}gUq*|)EkMS2_!vyP}DO2uP?@m?gqaW7~mE_8A6+*qULLBPUwN6ys-}hA`N#0PP zKAP-h!=M^8j650!Wp&^OW|VBbh#PF)3q!l+9qomuQC;=rYtiOw$qLI>Sh2#Y6&_n* zExDd*zhIE}ii0b1U5PMYg%qzFq=-QxO=JjRaKS1@6O2KSOOQt%SBYy0CNYT{8aE;M zinyim4Fum3-)Y=|V1~G-F$cl-gt$xt>sUxogkUkj5|*$`tRz^&8eEO1FxbEbo@s2t zpo9{(G^#Mz=Eb|K@iPpb<2jSU9S=DSfKU2Q3>%5xVPr8PvtS;^jF7W4c`HaF^fPW} zCM@oQJ=^X z)^9jiad6ea16@>k2M-f@CadL#*ZC9Ocn@{l!MvrCGcTO6oP$RWMrmfj!3+m9LTQ17 z1tAO>!X$02I(Y1$D6u!Fof znCo-E>*)@jP{qgLop769sks5B**!mWjIn;H=j_vtS(b6TqQRQqVAaZMshka#7U@5p z(^)wiMj<72p+ZXPLWPu6kAhv+cHZ4iKk0UQ#&+6d3zhhm8CWH0r!BTqmG3G|ns$07 zxdD^B=|IcUPLwx!oSULMZzn@#JC!VzoRV;)oyw-2D!SUrG(xFDLPZFY6cYN|scaPe z?UX3`+o^m>JBfL2Bk^w?r)hu7bW&9Uak%j{-9kEWwh*`v=kAGf6=OmE;^a8urzL!HZjK3qUlI(nrlLAMS;{fxj48I9>m?r z#P{$Kd;lj8Tr}R{pPTmg`2AB=z(9{boQ-pPzo(r^8^h( z$>JpcI?ms`J-r`<=NGOAck`6g|q)ByF0olokrKp$pwuQg-~(Xg=V=5~;%g)8~EZJMTm0Gn_ zm?F_f32vxpTyR7BT59JP-w|+DrTz}IK`Lb=MySA$mp;m6UrFW2sT)Y&UGW8wFh8pvx(-$VFa|fhsO>eg?|8%o!P| zv0>}ZVFFiD8v7R00+Z~X;x^n6xW+34rrDLB61XmKgOO`^oY!)ky*GdHa?w+%3YdL{ zyP4&uf(CA34)a)Gw8-DvSi&+^9P=vUHGZx#*ByaTfreA43(RHqJWI`4=VVP_L7>L5 zMS&Rx99guHGDmI;l$qo%FUS%FJK0`l$bowT)vSIFEVJjn(_6I!?5VP+={&B-ymc=W cMNv#xYmA99?Nx!X{Qy4AB|HG`Tzg` diff --git a/scripts/_00e_fs_nq05_vynrootscript.pex b/scripts/_00e_fs_nq05_vynrootscript.pex index 9ea6a72797d3398f621c23d134e930d493cfe95d..21c0efceb14a74a16b92c963e6f482800ba7a80a 100644 GIT binary patch literal 756 zcmah{O>fgc6dX5B94AdvzFG)hzM!5!xp2ToN|H-e+E|pM<=8LDBD0&WH;wx5koX_` z5KcVrx(FmB_OP0nee-tS+CM*k`_bBi2VU9k>=G~1@pzI>ll1&@{5HM1m0Bs2<9}s2Rag&-IAV9 zrnaD+p>&4&P-J8gvr-bF%wm!?7)#xOev~1l#8XHBC70rbtUcGb9EAuA5$Q`ks;# zS-4}rqH>8Kjvd`s@;$ADbnN8s0GiBJ%ldwb@~!5F=1}!@cR#=x_V}xLcDJC#J2T%y zyVmRV9i0Yw@DZSERfOm{(8s<50~|QuW603D0}OD;1r6!r9{U>-;6C?gNXVeh(ZT~f qbZtC5!V!zdEVYh3JofN}nT{|#TDuO}9WgdaBlvMaE>o>+ra?**d)zft0H0 z1YS?A_d*AmBU=TYbB@wZz4`WC<7jQGzW@5TwvP==|2dY@XZN^jDqC^n_N0=LINA`~ zQYhOKJlO8qqQhMbbv@VR0>h3JuBSXHY#*h@*(dI(6W-O0aM$BP zA$P-rg}EsVyn}0em(P zo)3fI5sR4)g@tHE?S90i)w0nwV?Alu~X)b{%vGw*vY zO>es&&;Znd2$fB9h?<8na*HP9UGg0-?CBx6c(dCVj-Fseb!}A%uRP^+c}U0$E7DA~ zq9j3H347e}+8%c+l$b6_R`9Fnjtn*F#)%H{Qq+YT=~5y0+q(J)7NpqX9Zy7PPEm9&%ALn>BorvxEFErE3U|n8VlqT>mmFeHz$nGXAd7nx5rZNLy6zOp zkqUI0F`^!)Cx;0-#uTP8Lui)1bC|~hDp(}PO?^x z7a3+4@?@K37$ZQIS#8OZWsadpNtVeW4rHVx!vaAvJYXm=ENXW$ERbf!@Ks|?fiw?| z#`q+)dL_-$tgNNsTka|Y@oH`p`aj%D|HK_tpc`DqBdUcK!(*({TemPtg+F0fiw}np XhIO)&_UTVrn#d|@QMAc0O>RE`9)k*x diff --git a/source/scripts/_00e_fs_nq05_functions.psc b/source/scripts/_00e_fs_nq05_functions.psc index 664606bc..0ede7ba8 100644 --- a/source/scripts/_00e_fs_nq05_functions.psc +++ b/source/scripts/_00e_fs_nq05_functions.psc @@ -22,21 +22,23 @@ EndFunction Function UpdateGlobals() - _00E_FS_NQ05_VynrootCountGlobal.SetValue(PlayerREF.GetItemCount(Vynroot)) - _00E_FS_NQ05_SkeeverTailCountGlobal.SetValue(PlayerREF.GetItemCount(SkeeverTail)) - _00E_FS_NQ05_MothWingMonarchCountGlobal.SetValue(PlayerREF.GetItemCount(MothWingMonarch)) - _00E_FS_NQ05_GarlicCountGlobal.SetValue(PlayerREF.GetItemCount(Garlic)) - wait(0.9) - UpdateCurrentInstanceGlobal(_00E_FS_NQ05_VynrootCountGlobal) - UpdateCurrentInstanceGlobal(_00E_FS_NQ05_SkeeverTailCountGlobal) - UpdateCurrentInstanceGlobal(_00E_FS_NQ05_MothWingMonarchCountGlobal) - UpdateCurrentInstanceGlobal(_00E_FS_NQ05_GarlicCountGlobal) - wait(0.1) + _00E_FS_NQ05_VynrootCountGlobal.SetValue(0) + _00E_FS_NQ05_SkeeverTailCountGlobal.SetValue(0) + _00E_FS_NQ05_MothWingMonarchCountGlobal.SetValue(0) + _00E_FS_NQ05_GarlicCountGlobal.SetValue(0) + SetObjectiveDisplayed(36) SetObjectiveDisplayed(37) SetObjectiveDisplayed(38) SetObjectiveDisplayed(39) + Wait(1.5) + + ModObjectiveGlobal(PlayerREF.GetItemCount(SkeeverTail), _00E_FS_NQ05_SkeeverTailCountGlobal, 36, 1, true, true, true) + ModObjectiveGlobal(PlayerREF.GetItemCount(Garlic), _00E_FS_NQ05_GarlicCountGlobal, 37, 1, true, true, true) + ModObjectiveGlobal(PlayerREF.GetItemCount(MothWingMonarch), _00E_FS_NQ05_MothWingMonarchCountGlobal, 38, 1, true, true, true) + ModObjectiveGlobal(PlayerREF.GetItemCount(Vynroot), _00E_FS_NQ05_VynrootCountGlobal, 39, 1, true, true, true) + EndFunction Function TestFunction() ;DELETE FOR RELEASE diff --git a/source/scripts/_00e_fs_nq05_garlicscript.psc b/source/scripts/_00e_fs_nq05_garlicscript.psc index 1190d419..16f74835 100644 --- a/source/scripts/_00e_fs_nq05_garlicscript.psc +++ b/source/scripts/_00e_fs_nq05_garlicscript.psc @@ -1,23 +1,6 @@ Scriptname _00E_FS_NQ05_GarlicScript extends ObjectReference -Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer) - -If FS_NQ05.GetStage() == 35 - - If akNewContainer == PlayerREF - _00E_FS_NQ05_GarlicCountGlobal.SetValue(PlayerREF.GetItemCount(Garlic)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_GarlicCountGlobal) - FS_NQ05.SetObjectiveDisplayed(37, true, true) - - ElseIf akOldContainer == PlayerREF - _00E_FS_NQ05_GarlicCountGlobal.SetValue(PlayerREF.GetItemCount(Garlic)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_GarlicCountGlobal) - FS_NQ05.SetObjectiveDisplayed(37, true, true) - EndIf - -EndIf - -EndEvent +; Replaced with OnItemAdded/OnItemRemoved in _00E_FS_NQ05_PlayerAlias Actor Property PlayerREF Auto Quest Property FS_NQ05 Auto diff --git a/source/scripts/_00e_fs_nq05_monarchscript.psc b/source/scripts/_00e_fs_nq05_monarchscript.psc index b39b221e..a5d9d8ce 100644 --- a/source/scripts/_00e_fs_nq05_monarchscript.psc +++ b/source/scripts/_00e_fs_nq05_monarchscript.psc @@ -1,23 +1,6 @@ Scriptname _00E_FS_NQ05_MonarchScript extends ObjectReference -Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer) - -If FS_NQ05.GetStage() == 35 - - If akNewContainer == PlayerREF - _00E_FS_NQ05_MothWingMonarchCountGlobal.SetValue(PlayerREF.GetItemCount(MothWingMonarch)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_MothWingMonarchCountGlobal) - FS_NQ05.SetObjectiveDisplayed(38, true, true) - - ElseIf akOldContainer == PlayerREF - _00E_FS_NQ05_MothWingMonarchCountGlobal.SetValue(PlayerREF.GetItemCount(MothWingMonarch)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_MothWingMonarchCountGlobal) - FS_NQ05.SetObjectiveDisplayed(38, true, true) - EndIf - -EndIf - -EndEvent +; Replaced with OnItemAdded/OnItemRemoved in _00E_FS_NQ05_PlayerAlias Actor Property PlayerREF Auto Quest Property FS_NQ05 Auto diff --git a/source/scripts/_00e_fs_nq05_playeralias.psc b/source/scripts/_00e_fs_nq05_playeralias.psc new file mode 100644 index 00000000..698fac3f --- /dev/null +++ b/source/scripts/_00e_fs_nq05_playeralias.psc @@ -0,0 +1,90 @@ +Scriptname _00E_FS_NQ05_PlayerAlias extends ReferenceAlias + +Event OnInit() + AddInventoryEventFilter(SkeeverTail) + AddInventoryEventFilter(Garlic) + AddInventoryEventFilter(MothWingMonarch) + AddInventoryEventFilter(Vynroot) +EndEvent + +Event OnItemAdded(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akSourceContainer) + + If FS_NQ05.GetStage() != 35 + If FS_NQ05.GetStage() > 35 + if akBaseItem != SkeeverTail ; keep the rarest item as filter + RemoveInventoryEventFilter(Garlic) + RemoveInventoryEventFilter(MothWingMonarch) + RemoveInventoryEventFilter(Vynroot) + endif + endif + return + endif + + if akBaseItem == Garlic + FS_NQ05.ModObjectiveGlobal(aiItemCount, _00E_FS_NQ05_GarlicCountGlobal, 37, 1, true, true, true) + return + endif + + if akBaseItem == MothWingMonarch + FS_NQ05.ModObjectiveGlobal(aiItemCount, _00E_FS_NQ05_MothWingMonarchCountGlobal, 38, 1, true, true, true) + return + endif + + if akBaseItem == SkeeverTail + FS_NQ05.ModObjectiveGlobal(aiItemCount, _00E_FS_NQ05_SkeeverTailCountGlobal, 36, 1, true, true, true) + return + endif + + if akBaseItem == Vynroot + FS_NQ05.ModObjectiveGlobal(aiItemCount, _00E_FS_NQ05_VynrootCountGlobal, 39, 1, true, true, true) + return + endif + +EndEvent + +Event OnItemRemoved(Form akBaseItem, int aiItemCount, ObjectReference akItemReference, ObjectReference akDestContainer) + + If FS_NQ05.GetStage() != 35 + If FS_NQ05.GetStage() > 35 + if akBaseItem != SkeeverTail + RemoveInventoryEventFilter(Garlic) + RemoveInventoryEventFilter(MothWingMonarch) + RemoveInventoryEventFilter(Vynroot) + endif + endif + return + endif + + if akBaseItem == Garlic + FS_NQ05.ModObjectiveGlobal(0 - aiItemCount, _00E_FS_NQ05_GarlicCountGlobal, 37, 1, true, true, true) + return + endif + + if akBaseItem == MothWingMonarch + FS_NQ05.ModObjectiveGlobal(0 - aiItemCount, _00E_FS_NQ05_MothWingMonarchCountGlobal, 38, 1, true, true, true) + return + endif + + if akBaseItem == SkeeverTail + FS_NQ05.ModObjectiveGlobal(0 - aiItemCount, _00E_FS_NQ05_SkeeverTailCountGlobal, 36, 1, true, true, true) + return + endif + + if akBaseItem == Vynroot + FS_NQ05.ModObjectiveGlobal(0 - aiItemCount, _00E_FS_NQ05_VynrootCountGlobal, 39, 1, true, true, true) + return + endif + +endEvent + +Quest Property FS_NQ05 Auto + +Ingredient Property Garlic Auto +Ingredient Property MothWingMonarch Auto +Ingredient Property Vynroot Auto +Ingredient Property SkeeverTail Auto + +GlobalVariable Property _00E_FS_NQ05_GarlicCountGlobal Auto +GlobalVariable Property _00E_FS_NQ05_MothWingMonarchCountGlobal Auto +GlobalVariable Property _00E_FS_NQ05_SkeeverTailCountGlobal Auto +GlobalVariable Property _00E_FS_NQ05_VynrootCountGlobal Auto diff --git a/source/scripts/_00e_fs_nq05_skeeverscript.psc b/source/scripts/_00e_fs_nq05_skeeverscript.psc index a6598d1b..e4c3a54a 100644 --- a/source/scripts/_00e_fs_nq05_skeeverscript.psc +++ b/source/scripts/_00e_fs_nq05_skeeverscript.psc @@ -1,23 +1,6 @@ Scriptname _00E_FS_NQ05_SkeeverScript extends ObjectReference -Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer) - -If FS_NQ05.GetStage() == 35 - - If akNewContainer == PlayerREF - _00E_FS_NQ05_SkeeverTailCountGlobal.SetValue(PlayerREF.GetItemCount(SkeeverTail)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_SkeeverTailCountGlobal) - FS_NQ05.SetObjectiveDisplayed(36, true, true) - - ElseIf akOldContainer == PlayerREF - _00E_FS_NQ05_SkeeverTailCountGlobal.SetValue(PlayerREF.GetItemCount(SkeeverTail)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_SkeeverTailCountGlobal) - FS_NQ05.SetObjectiveDisplayed(36, true, true) - EndIf - -EndIf - -EndEvent +; Replaced with OnItemAdded/OnItemRemoved in _00E_FS_NQ05_PlayerAlias Actor Property PlayerREF Auto Quest Property FS_NQ05 Auto diff --git a/source/scripts/_00e_fs_nq05_vynrootscript.psc b/source/scripts/_00e_fs_nq05_vynrootscript.psc index dbbf0fcb..53d33d35 100644 --- a/source/scripts/_00e_fs_nq05_vynrootscript.psc +++ b/source/scripts/_00e_fs_nq05_vynrootscript.psc @@ -1,23 +1,6 @@ Scriptname _00E_FS_NQ05_VynrootScript extends ObjectReference -Event OnContainerChanged(ObjectReference akNewContainer, ObjectReference akOldContainer) - -If FS_NQ05.GetStage() == 35 - - If akNewContainer == PlayerREF - _00E_FS_NQ05_VynrootCountGlobal.SetValue(PlayerREF.GetItemCount(Vynroot)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_VynrootCountGlobal) - FS_NQ05.SetObjectiveDisplayed(39, true, true) - - ElseIf akOldContainer == PlayerREF - _00E_FS_NQ05_VynrootCountGlobal.SetValue(PlayerREF.GetItemCount(Vynroot)) - FS_NQ05.UpdateCurrentInstanceGlobal(_00E_FS_NQ05_VynrootCountGlobal) - FS_NQ05.SetObjectiveDisplayed(39, true, true) - EndIf - -EndIf - -EndEvent +; Replaced with OnItemAdded/OnItemRemoved in _00E_FS_NQ05_PlayerAlias Actor Property PlayerREF Auto Quest Property FS_NQ05 Auto