From bc36f45e942647eb4a589cef21df15e27f255762 Mon Sep 17 00:00:00 2001 From: Eddoursul Date: Tue, 20 Feb 2024 19:14:21 +0100 Subject: [PATCH] Handle IgnoreHarvestedPlants=None in critterMoth --- scripts/crittermoth.pex | Bin 14183 -> 14231 bytes source/scripts/crittermoth.psc | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/crittermoth.pex b/scripts/crittermoth.pex index 501c4a644fe63a23b50aa77f34a0e48d162bbdb7..c490465c7922a9ede8f444bc766506c48019c5b9 100644 GIT binary patch literal 14231 zcmb`N34C2unZUo(Bwf-pO?SF-TWEn&3u%_Nfl{(isC2W5kkoOx&ATso_T|0!-b>rC zgDi?HBZDv^i)axM7eK^y+$gqC5EaV+F0(i;GeQMLopF@<|IWGhzLzv9{Km=G``-D! z^PO)$+kO4h`QQ9$*%&dxU+}|U@0H1|xm2MLv9TDTt4hroBzYxfTv$KV)YmVETp^+;{^@gmU*pl`$g$=2EAukg< z{9I2^XiW!xPG+_DW(U%Vb?I#Pj^*n7U8>o37;+Ok{xLa()~y)ckWO0}b$l}R{!TyrRR{N~JC z`xENb^v#(tK4)kB^wz-d?hO($`P@`Gy)K*U=nXcddU^{od0jT0&Jv;?bgK_zdsB%- zkRe>zOd?fCWix(S#)YC}`9_~;wgkQY&Qvz%<%wy3!AsKAu;x8Klkm0=XjYQxRFIeH zO-<(oxxo%UowmN^-?@_jj%Pq$n!w7`cfHxqUaZ7UQ<)j#WUw; z@@Zd9Y3~n$gcVWK)MN#A4E6_3XjOMQn-B7Z=I%lkA?|AqLRx}!y1m!$4>XA91nRaG zaV&iu!(^Z5=Td&AJBV~7H>NW1>z@L{9BJK`SZ<_x&oDVXkF<%`8m zX=xh=UMnQ|_UZ7<}Y%cPK@y^p+}D)Z53 z!`&7Xf^N;z5Pu1S*1&L|%l(}_ol@03kjn*`uzV+P-u`YRYz>kD#O^?pX`2)SxjxgK z3;evx&xqMbxuEI5E}5K)i=>r#T9C5!d`xyRYwz~cPEciXgP)H~&`y7Mv2&IqY|XM* z3@JgiN-H*;dt|{zc_!oy*x0*qAYDlHGYwo`hO>udqp4q)4uav8Semht>{iAO<)wjH z?CCV}vPrLB7b~xz)4?nBrt)?|dfk4;+a7p+p^)>tsT{A6m6;q6k=?UYdybY1aXr_2~}4#+9i@4UAwQ1JvH>!s{u!A!hC z&EN^h?2V?5R1aN`q_Q|^W%`kmJC%_$j~msCGZ0LH1IGyhkK$$;bqq zqPC)BA+1#3K%d7~A?2r8La9PcpvGIbGMSU73jH4kOl_!WxI*gGA|J% zed^6yib6YphSO7>i zRi8>T@v>er#TH1>>U3N#lZUN*GJDi5#|3aCXM3`-tKlrqI{C{eJGWm+&G0oxRz@ka zm6g}ShKgas>j~mHh>NZYwcG1QQNh(sIHRYJw0p`@n-+h!Eo7p`jv7_)b~altue)u+ z>u0}p>x0{JsKRhe9QQX^g-oDuNoE3tGDe?36HB%lsVd#zsE^VW+utoGswC-%H>Fl1LI$BabVuQ&f+lCB-R^eQn*YU)ugGV>y_K+rS0geRcDu0K!O$c zs4LctBg#~dBeG_+`FNBP?PH)*CeubZSjg$_fT0D%oY8ZK*JlqNc`r*z>O9KF>)V<| zp$K>MSS00}vY9}}`AK^;l<`eXg`ls$p+0UkNO?;(o0jpJ=y)CRG{!tD>R5~u&yE4HW@ciNTpMSL7A}C zR)QXh%KLP#mi1?MNqPP~T!1Rq=j+-+Gsd0c=Qm{&fh>>hjZP~;N0!5yb~YDm2AVU8 z;&p22DEuSw&e|IEur~#{b=h1yMUW1{i%giVx;QoUacb&orONGMc+wN#b_v!c<^9=w zr~P#8I8XH}qIlNVNo6`Z`*oJIyJSkVNV&x;NOT@a>XMq_T(RW11nV1QqKmY<*pzi= z^HP>)riZSrh#gu{8`Cf`$yJm~XJ_2%id)-cQrO$9p&EwbNKzNy)&VXIdfeS&&v9hR zo+?eJm@YBf^mdliOOfS^?;Co7h^a#^MAfamLHCaHQvP;VKvUW|-e%&XE5#tyZhMVO zJ;bBED0Z(dZq-XwD(@$Q!l0EdlcI>a15*^EhIl|cZ&$?gcEzf=H!hR9II4AVRO{lz z*VV~byS8+O-(BJNHklk5u#Uq;^Uj_~bX}a$x(1nG2UDwkQf@z^GL5aPi><3$CFMQ3 z5-eKB;lPzbe8t(EY|aeoEp~lIUp45&BY6JyH1mI!^0$^;Yte{3t5o{mmkqRo8JJcg@D?J0fHPhY89X?3B-P@eu;Hfuv4#=#&gS0Uie;jwvYNsxiZjwo|8}#QQ3a>D-N}s=Ry1Q%Ddd_$_}ui z4|-ha^bW@9ua^^@UL<1;yei-%Vh<|1UFfE_Tqd!GwQ$#ScS6EUFl1VLahZ#1QzkYw zZEruf{VZGE6W8bCi?V1fv%9Xw~`3Co1o*99sZ7BGw)f#q&CLY z+8EbBV_cApampLxlsB%D+3qb)v^C3*lxnCG-Y2+o=!PKEQ|PsU*4wsy)fMDAhZDMn6Si5x>U9Gd`yRm+ zUVc}K0*mgoS^J7WkJ=pA^-j>8N~Sn%a$r-B*lc-GMyoQLvG2#UO+X#7Dw}CxpV7B` zkWUz@Cl?e3av8lo2l36+NevScC%-l>h}t5pA<9zRXpAT;qsFSJv0BC^?L98aL2Vq{ z+BmkgD`c9T*1F`TgQ$LG67J}MJ$$oJwLZ`5m())C{!DYQz12^559lkiOpgs{SjV+- zo@?Vg*T#9ST`d!-u1HJtqV?-CmDi<4#^{SzZInfga*@fhS+)Xi1>Pp_6yHL(bW0M@ z_pC-LBL1<0kP85%j?<6d+va$Y#qwu4EQgI4{i}#!tchTpaWLLEm|z@K8V8fiBvTF4 zSdkM%?l&`lnHJ`lxn`bO5W_+<6qcCL-~>~I6U}I_#GC{y1x^N*jS8olBGj8wXfQ`Y zqluv2tOQmAO(C3SPBW*6u*R%0XN0iUtTktb&}^DbO9-u|)tqJ4zb?GlIM{3=*kTkq zEOc^o(7aWOtT%55-T}M|@PX|>5JJ)u|xY^tae8j?C<}RzON~F`= z1KbK*FyM)QTQhC?GW}E2m8&@;c?^OfH`2E zjNvKsl=;4eAD9T9G0&K1fghWnSi>iYEHXa>ejdUv&98tLLwLzVaL61ouUPo4iQsqU zcjgbkpUq#auxd(TjIIiX^?)YxS!!g8$gy$-a2;@?+yvYl!!2@a2)D^?az_Yv%iXdE zxEHt&P>C!)WpYrS1w^K)R3ks5IbEC6WUo91?32ewgadLwzAN8j*_k0SlhuWRGJlKA zl4G<5zF20<9NU(;GEW=j%^sigL!|Wky5%o_{PY#im{UFOiq>Z+`DdJx)rzk!~PLB{HQV}b=e&~juc}BeGRWv@Z1oLtp-fGNdgm2QQm=H>4-TbX1r>E}EGjQGQU{8zOI2JM zO2FScU6G10^f;U$S1W1Ecp8>^wd1^cn6TBugn?ff3uC0>(GV4ee3geV9T}<7U|?Az zou!t6Ulj{;mR%JM8ETo1oNeSLBmZFJGHbbh82u4^6;0$Xmi6=Tampk7NV z@Pu?+8|MP9e=Kqt!sj?HE#>&I_2~m@5(+6@VvLGGBWuS>w<`*Z96-(tRJH2~UX|dO#cI+OQ zkj}q7u8MC7xk>%)i2oF5BwnT(xyO=j$B}zf<}?N|`#%$@FtXH08w(Bs(fuhW^RwW} ztum?6J@%hUC-z0@HHM3rwHWF5D}RMG{V;!wLZY&}QMcQ=Hb>D;Tte-i8%;Zz-s9xB z&)84$h9z1UktO3s)Z~aPeV?}REmKRapDGEevl@3pUqh>{SGcG3K|IxrD4s<5A%G1=MkPS@_dPBF`|dg=IK=Z14h1#a}TJtayW*~?m6N@KhMZl;571J zm63;xoE*pdAsbpp#El2-zlW%T&(mVqSM9Ke7)Dod*n{CPB{B?={CkjL57T1U*PON^ z)T}ac{17!?U>FH|NRzvPh86tq5#vJXkHBe};C|5#!|&-acZpT%!WR)&ZY}#KBVTuF zwH5Q1IIp&U30`9O4Vyq4QoX6zMp+a|`oC%W?T$dMi4#8K#us@BqxTqWM9_Tp2Ts5j zL5Tm%9A3aoD6Y2^@)Z*MRi3Z$e2eGXJhSCdhV6yzG1k)W@aUOsA3ghd9_M+2=KwrU z@;oIT_bN}Gru{wW-{<)O&oewfA13~7Pq|O`W_`{R^}b9>~1i!&s7qw{jNA@Jr4I1 z2xoTj^=&@M5Up?VNrrx8M_2{Pj zFSdZJ9+vEjM`!%kH^NvRd$?w((NPFesJzjdxX-#q_`XLtp|ag#`2L9cecDhzXsM4! z)E^LZX3-ONR2{}zDaGB+4tJ^B2OkMS&gvuio(Mw)!#>zuI-hVO(9y^UCyL;@<7vr= z{fr>{4AR=5`xZ2*KmxcQhn@kQWlpQ{1q;{Hu5J&)JhZwIbW&VvFTe#s=YUO}illyEDD@F>u6`W1 z){jf{9JE^}OzCGuI6A?K&j=>+^KQ*p0>aT0BUxeo6DiIzs`UAio##8CP8??-I_!R< zThe2;gX6%vkm@!tUVWCl4`HGxiVy!)tZJssukCg%lS+9f%8P8ZFR?x9mV1cr->_Z2 z%qtIl1){G+RMsoB^)-mjwux5ei_vUjHPvIui@Kn^WV7%h383{7j=iK@bFsOe9>(5k z84g8buQhUrI=abT_J5;P_a;|cdf9*3$ZzJ_ujPCq<{G}BA9D9gE2ntBv?xK;D=i#{ z&>wUBwipPai8a@h-eg}^h5SmR3YR-g*E>zGI8Coui*UeQo-K+dy~)Dy3Yub$BQ#wf zY0?V+UC|C|p+4$*WB1nb(!^ER#Jozfe$Tn*4%I6)L%+^I73#K`aXJrue}V1CK8PJ3|c9#5tqY| z^lV9y(=!k6F5>0DMZ8w>(CgvMX|jU4ea)Q@UsF$XBRs6MNHqn9G5m83;TOL>hI~ZxC(7r3Ct-a&3UhqUGi70IAfIy{QL^ex z8O@RP#OJ*5_ZU=;&S)#<2*$|dvf_%0K7v%T_?e37x`{s*XNMmFb{l>a)IVb;vP`-9 zz#daotRiZe)zeIb%Fr948N#m>rx<=YivG+T*ktUGa^rX12GOwA=!B@(?;6HUEoCY< zQ>d+}+)G$6%{1m@CE5S72C#yk{_v-BCNUFo)=J7sA&LC2Rw*BUbe|KVT2Gc)wj;4_79QO0Zc%&5DXEX}ry z0Ufin?2fT9nnmFr!$0_rv0{|ZNUPORQEteboM>bbGhwc4#Sxq1BBr@zH)530qg+XG zFjZz-Icz)pSZ@~4eOu9w3MI-yE0uSk(~#j+xO0on%2`?#cr=S&9fp-fSc*|8jGkUI zG-Jgj?k`0%bS6yy|I$!l7E-W_$op~B!SSv(WE#=+Y;>dRzx7qUJkF)?IPK*?OaB&H6l&YN`UsRZO(<0QvZ;{PRlLdlZ*uL;z46|g zrU7{@tM2N$>n@Z>i>UYjDNg|r1bm{xqOJ~VvS+7dA~o9F z_qSzZ>0BzN>^cX0KYrdW>{yPuVtJVc&9-E}AFN?xY_}bqNcYBM zy0a&i@?A&LnrGYafZvYM^HRE=pR(Al-tAIv<=_vuiX9zzjmdVN^6$iNJ$>ubJy}1N zbL@0tmkK|}&kp0!tTSQG&Kb{=`cp8GIm~YB$!D@1e%|lV1t{-Wy2o*u+1k2+MPt8> zvFuJiyCv%M_F&}oz3EKWKP#5q<>&Igi(JQAJuuq(8~vCw&E(eB(JP-0{RWKG zw{b9)PY&QkCj_zE(BHbiaURp=f%5_-ixxC@3_Z??Ws{L5t9u5sSw9^F^2E*E@50<$ z{e(|vk1sQrkBPQs*s~*|XsYwz7|N~nQ>o6r*nqFQ=PY02-P%h%zeB2fQkfjqvd)!q z_d@R|$lNMz7{+!N!f>_;HnCFx%vHL&g4fz_IHnAk_f#wnqt{6Tk>wA6S z@g~#9POs8@?6`5sEb@!;ikz}Z|AmDj_@ z>gM>!lcIX4aeYLkqsQpa~PtlLQ{&Pd0)c~`af`8_+=WwK2jGKtMaRdU|h z{%|52>!;GLf!=lM`eepdzn8`NS?D{lL&^{8^hrdWvTIAnJNy(irmS2yn6`x`OD9%y zL&-d~dtiu+EsHc}G(i#2J;_88Q*f9vb$r?%;+jCKDwDRi18rj+*IAuOuSE^LB$p^fzQH4!ijohm~n!k?30yoO^=Z8u3(g8cI4(1kzP+ff zRu!2kldbLAsZ`qXd3P19X1{I8_m=jCy~d$3o^ zIlH(S-2JxVbp6(JPak(wKmK-abDFbHZ>A(5lFBgO20-G}oN@h$E~>+Bqh8FxPcH2ClMHNXq0jtaa1uSJW=?k=9?=FkI?U_MR@vz4=MX#kC^?jTwdi9GW zXr`p{(=Dr|vR1*1r3M46YWI=BhjNgbOqv`SQPO=xZH?mWBm4C|Q*>vPdPPxP8d zK4&-LyD+FNSs0g5lr=_C)<~2k_{_lvjjpJ*J!w^w?uoaC5qyf zD2iL6owY1l^Rfo1BqiEp)m3P2FEn>VVphnckTf);%!w>*oivX*~@5=%fvDe{cpyrfH5$(;TIr=Ez7b zk&#-Wz-WomPfL@2r*L=84Su>e-)G&Ymtp(a%FlL!lB!gA?Itp#_I8;ZW=U7z`thzKySB@u(NtkL zG)Ga_+#;ntnVgj7xZVY;X^4#65E;24GIGO8HC}gnEY&lp-@MYj))F-w!+JXpKB!D! z`$vHm@{Nw2hDd%xOIWW&jb&la^02WYY^;=uge`L;RU>mZM1F2)l)7jmru;~Y>h(E3 zgCuv^j}qaB);%(X&!t96^uwz*O2bB($VAyJTYCelyIbLLe{8Rg;G6i^pIT|c9Zv;*TP5~Aj6_%O;G@D{*F-O8O6GF3D4y*)P z131;3YEBDam04v@4`8)fZPohwkuLLT;D!KhG&h@D zf!l!FfjceSW$rR}2XL=Z_yTZ$0ADf+Uk1J!z&DM9hs?3zVdLNt^N9IY1m8B_Hs7=G zeG|f?=27!F@Kf_Mt9XsbeDfsms{o!c&jK$5@Ea4ti{?f1I}0zF5DuDy<`v-2<}a36 zEg?~&xxkPGXtIlCl1vtvE0+Qv0zNF40ed32QmzVMpX`%s1GrAElTQIR05<~4k(5&^ z2jp=;q)xdSd6MQ-ZPv+y@^#>w^6;4Oh&&?Sk?)dhrin}^r!Z0GoGdfsIBkJ1keO1i z&9e3@`JELYZ37^)17x+1&ynNx+q za+3Cy$Q$I1A;HN3L5Gf<5+G|I0$CJJeHG+QA^qa8cRIaG!rrAp@0v^KZ3ufCLt0g~ zDL~dLNppzkNQ*4vmw(H{-n&3ngj`mJTvTFffGD|~DyP}EtO{vQ4~AFo-Mdd#2gsU_ zL$xLp(iXB)7px7CHV>pdKsxTbM5H4mQ`^pwGeFnT;s9AHXM(8WAd6)^$eSIqTFwU9 z;E+by2(rl`vpBF$bP+KQ+ixi#OXMw(ZFOXxbb@Si$Vv{kdO61-C(F4Ynh+7%EZYkV zPLLgpyv>cAB7X<+c8AQAcYvJdkOlHikeEZ3OE*Z5LuN}H#765lobH1p+(?u37DncA zu0~5}kYoW_A@2g&>E^siQq1XhNSmZVG7jmG0pjo74p}H!Msf~0UGgA<4r!NNa2s;S zDk(#=TB(rTPDAZBGK@1zYV}=Xq($Fl#RTOX_PgZ*Hqm?Fdm+RZ$;C2p21S99ON^Xv zHx}sM8(C%K0*k_F4(*vnE;aHGM&6^nB}Qf&IUUmX7G@d->0v@KulE&DQ!XfXAsvvt z-}Yam+?aSFiNUtZ;rowv=mLoTsW2Il7nBQqA1L%0Y96wX)rgS~7L8Eml(N`=RsuE6 zhp;g#q^lIle<@I^zW>TNy&o>>C5w(QtFKqVmqW=mbSHs=% zQDc6zz!p#Lbre?=Q+%vov{I|h-V&K)-Bzt~tke;bu5ps~IZ6AhMv)|oBIz3DLa`4? z5ycUbt_dZTF#qEPJqV|ka7Y({USZUl5~-u7IL-_iu@Vp2Y#`Lo*Rg>e)v5=-}U(SdLv(C)z_QqPYyD0R1dM*FL1+-NOJgScpcu6SPQ z6pLG0-Ik19AM(7KO?aI($bMR%u&tYDebTmWhWZwmSJ>C5`Nf!Ye2QP<=}Shwj5aEo zv_c-)Z{#K;H#6!qxxs2oz}{*VyMYDKx|Lpip~J0qT@c*nG>3rJZH^##73gr)S1jFa zI!%sAT<-Mys*&537`?H~0vLZ*HxNQ@r#ZG94U(_f^;Nc;+&xV|QR2JN9Pq&#TuUcq2_vT6Zw@4xOso!VceK zr@>7|+d+tz#c*-i{|uaW!c z{f=GT{o0Gg?q$6!=>F2f{3B>+--CdAbXWuQKW*IEbG)pq&BF}#M=L$svMHk8vBfII zY#%6MOZx%XKJXfB+brAP25Xq=*kZ=NjxE)GnU?%zYq`;tX(4a5t#xd%``^kIj%8~p zp)K3-jxCP*TiHGh+jdm8Z1t2G>4d_vto(;;hQh$#B@}Vr0|cyfUnMiYXG6fEn#YLe zBLdc`{icy>Mq#oi{8&>y~Rie$Rt#=$oIoQ zC?o#vFFI3h1a<66?SMT=?D1m<2v8rc?r5Sozc@TRg@2}=`fPl0B~)b(x1M;=F{b?hVs~V!v?IiL zMjA(m`5{!;>ws?U4Kys{yN;L_aQ_jMmI&$>>@>8W8c`Q%rAzoR?8w*5{i%_kIkDP` z=!+Jwy8i@PZ1{6)WouHsxZ6f)Xi3KZtKfx7YbVysGJb4}Vk77Xqc+3+wYuPHBfr3j zb@EGUqbG2;)<{p%^Azo0QR6&Kq5BN@vpm1%d5-6K9xaAn;QbpOEsnJ?ev!8p#$6~w z3=k5(RCj1ezlSz<`K6u^PdF3`T2HW&CzR?fP_3aZ;?)8HEFQFUPlha>xAtaY2#wl(H*D2>7#hzm%6S;&7%suj3`-Y1rQ99p&?*n9Uu< z4E)y-GiE9tPEls?SAHmBPk(%jD7c|!z`IXgNf1)eH z)AUlv^IFI+()aRmmc=>FIs_uBsc|EPVd+W|OM!V*cV~L0Sqq7qhV|7n&sfpXG>6)0 z&jhoffdO7Bmir6~J*Hd;o`eA})xhz8IM9If_Y5m~0W=cq^etO`(LGxksjxFwGSewb zOK1Fs8R+s68(lUWG(fM$6|4kz=w-@92~-~~P$5t+Q&2orO!41^U57wIcdr%k3-(!f zp{Zut)7CK~oN*1kjJ)VXzNiFRG&qqKMWo)Upm-6H5ycTA;l!$nMe4!#+k$4CEoe51 zMum;c++*FdO4!i9L$%8p(VkC8tc`3p4o8rBD`WcJ_74n;9qFVm|pn7(ZFgWwfQ&;kLiR~$j` zD$rrcuUNWQbebl=qZ1b{J%3PQ;v0SR((^~n2h95e&9UXE$G&F0YUL0fdg(#q(F!Ty z`^O}l9xSaCs|Q60G4Q9bs>eE?0iCMH-VfpJyu%H<=!=S7VQ~OVmP0uFuq-1aE=H+( zuI%+Bp?XusQ_fStL(O5v^RDEn;+eox%~L~vEy1xKafht=YV^-sa;O-`N{3j}gLX|3 z6`E@=M*?Xj>SecU?>9#F5(mohFh^=YRl6QY*r!VSplj3x7;y)f%_!G zuCxn;dyR50x2h8#hm~GkWhx+1Hf|RmLpo~9X3$tWo5~)Vpml(y3Ku7S5dQoN4CJK3+~Ub9wWZ zIKv;{%zT~`NZNDp+ljhVGfSmt^0STEk$+}~{kEZ(H#Sb_1O4KEgrBCd{y8p6<^*dr z3v75;RDI3x97I{X7AJZ(J{dS(_ZvkqHaec%G?)L-&9!Wl&d5x=;BxlKJR^&ZG-KHL zt`%8qp3>7lk0CqD%tO%;v12^ThcD^o1axC~M14f3th8Jy+v;4Hg$W2HofnV)U#xW_ AwEzGB diff --git a/source/scripts/crittermoth.psc b/source/scripts/crittermoth.psc index 572f9b0f..fcdd3414 100644 --- a/source/scripts/crittermoth.psc +++ b/source/scripts/crittermoth.psc @@ -326,7 +326,7 @@ ObjectReference Function PickPlant(float x, float y, float z, float searchDistan endif endif - if ! bSKSE || (!newPlant.IsHarvested() || IgnoreHarvestedPlants.Find(plantForm) == -1) + if ! bSKSE || !newPlant.IsHarvested() || IgnoreHarvestedPlants == None || IgnoreHarvestedPlants.Find(plantForm) == -1 return newPlant; [USKP 2.0.1b] endif endif