From 2b93d72a153b1717a23814aaebf2cc76c6dccc47 Mon Sep 17 00:00:00 2001 From: RedSparr0w Date: Sat, 23 Nov 2019 14:32:16 +1300 Subject: [PATCH] Add trade zones --- .../src/redone/game/bots/BotHandler.java | 7 +++++- .../src/redone/game/players/Player.java | 20 ++++++++++++++++++ .../src/redone/game/shops/ShopAssistant.java | 1 - .../redone/game/bots/BotHandler.class | Bin 7060 -> 7209 bytes .../redone/game/players/Player.class | Bin 53279 -> 53745 bytes .../redone/game/shops/ShopAssistant.class | Bin 12705 -> 12509 bytes 6 files changed, 26 insertions(+), 2 deletions(-) diff --git a/2006Redone Server/src/redone/game/bots/BotHandler.java b/2006Redone Server/src/redone/game/bots/BotHandler.java index c56d47ce..90c95886 100644 --- a/2006Redone Server/src/redone/game/bots/BotHandler.java +++ b/2006Redone Server/src/redone/game/bots/BotHandler.java @@ -30,6 +30,12 @@ public class BotHandler } public static void playerShop(Client player){ + // Must be in the correct zones + if (!player.inPlayerShopArea() && !player.inBankArea()) { + player.getActionSender().sendMessage("You need to be in a bank zone or trade area for this."); + return; + } + Client playerShop = getPlayerShop(player); if (playerShop == null) { @@ -182,5 +188,4 @@ public class BotHandler } } } - } diff --git a/2006Redone Server/src/redone/game/players/Player.java b/2006Redone Server/src/redone/game/players/Player.java index 77b0376a..a4fc96f0 100644 --- a/2006Redone Server/src/redone/game/players/Player.java +++ b/2006Redone Server/src/redone/game/players/Player.java @@ -621,6 +621,26 @@ public abstract class Player { isInArea(3422,2895,3433,2885) || //Nardah isInArea(3685,3473,3694,3461) || //Phasmatys isInArea(2530,4725,2550,4705) || //Phasmatys + isInArea(2834, 10215, 2841, 10204) || // Keldagrim + isInArea(2379, 4453, 2386, 4462) || // Zanaris + false; + } + + public boolean inPlayerShopArea() { + return isInArea(2938, 3389, 3059, 3329) || // Falador + isInArea(3172, 3449, 3270, 3384) || // Varrock + isInArea(3200, 3256, 3237, 3201) || // Lumbridge + isInArea(2716, 3498, 2735, 3480) || + isInArea(3075, 3513, 3106, 3466) || + isInArea(3074, 3262, 3102, 3239) || + isInArea(2435, 3101, 2459, 3080) || + isInArea(2618, 3075, 2598, 3108) || + isInArea(2678, 3267, 2601, 3341) || + isInArea(3265, 3157, 3324, 3215) || + isInArea(3386, 3264, 3348, 3286) || + isInArea(2797, 3454, 2838, 3430) || + isInArea(2546, 3157, 2512, 3176) || + isInArea(2451, 3408, 2425, 3437) || false; } diff --git a/2006Redone Server/src/redone/game/shops/ShopAssistant.java b/2006Redone Server/src/redone/game/shops/ShopAssistant.java index a220b26b..ef1ea0b5 100644 --- a/2006Redone Server/src/redone/game/shops/ShopAssistant.java +++ b/2006Redone Server/src/redone/game/shops/ShopAssistant.java @@ -472,7 +472,6 @@ public class ShopAssistant { boolean isStackable = ItemDefinitions.getDef()[itemID].isStackable; int freeSlots = player.getItemAssistant().freeSlots(); int storeQty = ShopHandler.getStock(shopID, itemID); - System.out.println("Item " + itemID + " stock = " + storeQty); if (amount > 0) { if (storeQty <= 0) { // none in stock, or not sold here diff --git a/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class b/CompiledServer/production/2006rebotted/redone/game/bots/BotHandler.class index 98a295b2e83e28bd6c2e2f6f914edcb94b96e03c..1513ea48776522ba67a4daf7f420fa6ab72506ce 100644 GIT binary patch literal 7209 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 xsL_OpJ4>y7i9?@W;CGM8i`X;`uY1Kj$xW z>!mF~5F8MO2C9LfSAuI08lZ z&tf(4poT*l4r@4~;i!gVsxmL5hVtnWJJ&5BDx3I2;E0Tr>Y0c_vW&%9Qn}?qk6g`E z`(*PEklY-(Wed&PQp4LCT4`vF36byM49YeLm~;f4blKLF?L<{C5CB`YmmM^8#CesS zOxanBb+NG1RYN!3O+iqj%v?4Wmh7p?z0_heG|*nA>fzqnNFNP-5%|woM6#bA=&xab zhJo7fAPdC@YaK&uIaGeAVVH*D+V%)NFj6z?B9^0cceIumqg!M3z&P#bcv0olE9X^7 zt8id~9+;?Ml7`8ed5Tu>k#0@ZFpWYtoHVQqrs0V#r^^|poN3Eha<(azmYYKXUcS_F zbG67kP5W4PKhfR!y7j4UrRjkMy1P)f($!U~T0pnHGUaMht}*3WQ?4`RdQ)!D`ZF}^ zMh%-ZY}T+v^KZpUmD?=2UG6}qWDX6Hnl=tsjNGYPyKK2zel6u5ZFsMg`v~~D4(!)2 zC3QfH9=%csgfx7=^PtW}GZxu93$UEHnln0}UL_&y0K4SyMeLfx7iy@hAzjU=Qm|BI_CU%^hdpMq z9bTU|aO6Rwki*i9vW`3?4?FS*yC&sPM;_z-9eG@yAP}nJl0#=#mFycwo>ac7#R8|~ zX(_*T5_YKMXmjH?{7L>CEafkbyvQy|dC8HN<*({! z)r4GEKhFL3-kef?N)+UW^ zX=C%WUvo8ls$sr1)`&fDp@5l%8p&DH$Ay9!=bmSv8!;ya@u=}Wpzl}2>|G`<2k2O5e@KnPyZRWYo;|neE z61DM-mA?mDJG2$)hgP1ABr z+w?iSJKAQ^n%6;#rXTH?*~}n^_robRgVA-qT^Gn24eR*^hi~Cq9n(b?=3oNM5Ddu7 zuI+?6W|$dHz$npO%KeTRVdfxUzSp~3|G~Zcb#wSA^fJIAwXI0B#h0Q=x>I*^VwY{w ztz3HG3uI(lP&ps2qnn^%n1&%5CTVz2!xRl4X_%@ZLnmOFhFyHO!}n-tt@GQMHz827 zcIN?|d#d<)Gb%)x(GKm3=8P1hvSV~cpzmUrpG0mm#>_3vSjUW`6CE>;_9vjD%j=l= z%y@OXUIeYoH)mM&3r3MS871Fsmfb2190-6hR81e6Gtf5Cb@sVVSJyf0I&C&X@~1}K zMAsVUhE{j2xo&6~k5oF*_2qPZ(_CL6*Ehi<G%>mTJhqdZa&l8U>|G1p%n zm1+`shU$Y{XPxWhbe$C*={l0ux&Dr>v(xnl-u7tckk;Gv4|1KMuD`oS+K;4Q*T33z zqFjHvM_Pwo>~;MyuJ5?(&*704B59=SFM?jV{&U;QbZxcvEm*I=H^ZuD^%ttL2fJC89akKTDhTkM~Gb(8#ZD$UxV6+ zh?{WD^+mb~KY64`;5PtpG;9!hMgjvxpNQPTd+dG|FCK;GdP+_{g^9E(0mAdLpMkJ50A%c|LM7SJiw|9YCD(V~ z^%KvF=NM!+*FV&C4!ZtikMt*!uoAbr&N9~-?UBwW23&iA>tE^GYhC{*9_;|KQP;oC zb@I6WDIRG(k_^|`?K&~9YZTHk%CW8!?OJKBV|rYeYCXHuwe!19K97W{wy|XQyLLg> z@ApWUYG<$OV97kgwXr#%=N)sc7sMXdAL=^iJT}a=earQabbaCfPAKNux~CCwF&Ii3L!h=X6y7mDgr3GQs1q=T!)#*&EHg&J zRwDq%j8X85F&gd~V+b?Gk`QCif98c`e`8)upihba)tuy0vxYY&lhozmu_Rt~7@0%m z98ubu3I&X5kZ87Nb0D8F7xEh)t0NW5n3oYL8 zmjf-3pbIETwHWoSwH4#v2J4Kis_5vvq)89DGd@jXh+tv6sv-cBz=L zc}d}n>SK!&ebvTqeB_tW!M8;PlT7%PfS9x+CH&N z=>p);f)Gj*y`05*&WF9q8FGd3a_AMoHEHqk^dt0?aNO|KtVy+aVTh+iRPRZ-sXlXP zN^zu=&=gWR{HWac#fG2@KKW&z`gS=4xHmNA~0m5k?RP2+{xfP&eC60;>W z%r=yo9Vs)rQEv92!t70@Igpy>Flw2jsclXSP{*7~{pKv1&74Pr%rqKoE~c)zjE0!2 zXm)cw4K=sWFmo3TH}}&B^9apho}`iHS(?+lKy#UwX_R@5Mw_>2jCr5tHXqYi^Cit= zNt)LRqWP={8gJ#MGpqu1rd62Ewo22vRuwwWs!2bwn$b)v@D4p_b)tu?_vjI;Cp~8M zqsOf=^c!m;J!ws)r>t4@w3Wt8YcaE|Wz4qLGM}}PIo57=z&gl7ty4VQI?E%hA9|3m@+j*%&#?aD8?C?jChHmBY!kl47W}a7=ik{O{EQvJ&)QKU!j2O;0(O28X%`dQ z?PRgTt}1rgwZtyFzSwOy6JOhH#2&k&yl3~IrR`K&#_ms(?UA&cJszJQ(F*oFTG3vJ z&n2{qy@pn`GiWt?H?3i3V*ePeW1pjS?F+P?eT_D-|HA$Q+Q@!R8~Ye-k-qQSO+WA*ragV%(q6uwXsYjb+S_-B_VGQTeH}*o zI~E=21kpiGI34W72Ix>Hfqv)|p(C7RI?}0515QIa%4tGJdqv+2OnV@Nd!=sJ)3RF2 zApdLH30$6fAsF@}{Al2{e9pfu+_9SeyI`EAyoz2h-ny>{AumxeRg2~)ld9_b`5lUm z15U?-pH9FPHy(1*Nsy0Dh9YzdB;)F;NT+%Zh2uJtke!!PDWAsDYP`Cd^l683Y2c#^ zP&OUn=pv6V5g4w~D*qaXD!c~nnFJ!B0I#Xtg*b@ewN&o32-H$rl}qa$wgj~-MJ>xA zjIMwP`XwaMm1=WZT>e)QNm>GBsTYC|nBRI1MG5iVLe+R3^*pUlH$hRlSxs0FSH7-i8lWk!rxig0Bzo>JC<=Kz<@{gecIbbUk z4lInNcz9OV7B-Ch8To%f{)>>EUdAAPg#>y9Wqwl)(~}~aYS%qC1(0WuU2hxBcyl#9 zy&k!yzE4l`weW%i46dchwkV3ct&$d}|BC?f^)$_sz?tca)NJx;t z?-Q*v`Yt|60xSqP3kI9H5X!PcJ{AfESs0XK;n1ArfDc$s=)EgbOSQuCPLIgB6CGtSH=P#o#F`2`^bGVzSc2$I6f} zR+dDwWRjniBY}dfJSoX4kYrYgRAZG%O;&|8VpYl8tQzUas*^6P2IN--DmlP#!Gg6maBY_sU*|r29dmCKV3ZhtRNMLQD2x|wWSbIoj9iTGn2sK$Jc#Cz$ z>~w){tSh9lZZL$Uz);p5MzarKJnIP`v0gBPrNSK68`4-`%ve91j{&fb4aTeufrD%q z9Am>VYa`$+8wo$K09<^Zje%=yET(N7++pM45t~3Ln@DUn36D%uNEDk+;@Aul&t{S& zHVZR0o77^8G-Pu~OE!Qg6+VNyd8Oo>%frg8Mc9H0*NTb!*Y}~lX;c!5G>jDYTojbwN_$sR$-~E20vQ^ zx!78WW9uN1ZGe(&BUE6Up&Hu)b=X!sE^UL}Y$pt4yI>gG4U^c{FqiFt)ohOTEO8@IZNFIA{tyUu7;>^B zki?EbQFa{4vXfAqox%uCLw)>V&-NVXbP#wDP&e-BG8FKM1>Z>nf zXjk4%o%r%-;5K@52fewA-rPrT9-uc5p%VKWYOsHx9(#=5Ji&r{3a!~Q=)j(1;k`hQ zUP3A-Fq9iGl2aJX1&rqsrg9rT<~~@!9azMJU;r-V!qHQKZ&X$i}BZ6rYYSqZv?+&&0$0ENI1N!@FF;2tEfU^0_!k^I!%4 z7`E_FU_YM^-|~v;OZs8BxiPu;(u!5rubEq{0$|4N6Bj_`N#hwIZAce^j72zl)4Ea{1#TqUwCG^jc2Yq zSTXn1;Z1S5Mq>Lx!*j@i@5)#KkWUy; zP*5l$7?c!Tjocg&J}xWs`0F*u^i<#hX4U2*>d=<#@vnZc1!n~qjK!`41WeC(Z0Q&3 z1m$k2VvB4LE`lLOxT?*Tgz$DRak~HAI=ojna!yq3-Yb?(L;)AkV2c>$ZH!Gx!v> zacc>y5UMK-!J-JxV>D&_BNeo5SmDx0ErZmukV7OxZcz>rL+;sbbF^n^Ad6}pJt@UG|!y+l9gCkDb$F$e-;C`=F^!bf5l%n`$3kr)X}#aLJ+ z#=$x<0k(>XuuDva17ZpsDIuo9DKQPsiW%^em zl^Dt@C@a3gJg&x2)_61KeR0FHk@v+7%V4Hjv@0cYJ*H#>)=UQK*n~PZLlve{GnPF@1NY5jX}?97n|`aFV{kk~s-c z;uPc&r*V?Lh05X#UTU6&TH+k$_&hWcKjK7PfPvyCm?D0GS>hrnaS7&$U*U6c74vxw zz7T(4KCi=0aRZKsn{Zy-g6sIaE$+ZGahF))0dd7c5+NRu*ns$l6c&$3dGUW?s{@-*D?DdaIm^942%85B4A@mA``eWS@jb+>z{>a#yYWgG}sXZMGx z)%!z8Io0`4m}-oa8~a^SN%u%ykT>cht*+?}x8ln7|CSCG+q)?{Io8m|_J!0XliT8qD>bW*3 zGen&~7*6pP1hvGgutQP4tr(Afg|F~vq2VvrXBoEj&L!KUvJRe^A_q;?|6l^?>_xQh zV7O{{&{fwDg_D(P{lWaChvy<*Gu*Lk|b54(H>a*x#9zTJ4N)*;~ilWKH09~tfO;(d?D zy9jy5Bku$+hU14#veEP5&%-X6>~U`5n^owMcs!?YIo;E^i_P#f;$@cVbR-|HPo4a2 zuY3)k{@*E@i-Pk!^}if3$#&1_r$<7_d{1l#->LE+jpqxID;>FVQ@nsu{f_1%pLye7 z(}Uxwq$JuP>RniTJ+)Kld7(&O3tI+%vXT)rCl)@VNK#OtK)^8)(#m`m1s-23?f zwf9(T-c8<;(H}tYrIEFT5T3~odf^><#TU2r|KL0Pn(v6Jb-ZKT4*b6XJ0V2wf-w0t zM9V!;RPKdRavzkDJD{RGs4|ZiBS+PvcJHJ^t{@_VQ*e}sDS0yL7pc-r)~m=hxT3DlvZYn-LG zG5<#Eef_b4l{9>Mmp`czzS&UWGJ5nYM9M4Z^;OjQ8?=Sos8R=bu5MeEvqPNm)K6 jz2OrBBQzL~T;Hm5C(C4?1A@omu_X?D{7x@Ce&&Aw=;D2r delta 8530 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 diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopAssistant.class index d959acde85823737d7e31c44c1409272f766e0a5..b1ad6174ec3a0f286b51f016e24c91cde36a41fb 100644 GIT binary patch delta 3638 zcmZWrd3+Vs75=_EFK_0(Oai>{*d8Gd2nG@o0tApnK#)RFFod(S!Fch9}&%&aNg zUr_PJ>6f+x$m45aEWm*f`r}|2pW}-#{)I19`znmD@l9A3z75In-zpC2!gpbOkN<>l z7(b}?V+cp^QwT@ZU$!LTAU1{q86ug^0bOGGD)bQO`~s1 zML-;w5FB)lhVJJB0yEpaO8)le^DqLaDBo)aHn}pev z&1^=(=z&WP$nKaTDw{iu>br%*milfb8DMLhZPYL3u&usR9k$bVn!~t-CPM~0Z11px z!;TKqy^-u%(aGU?VP>$i!!AlEGb|#@VONLQ4s#rKbC@d`VRwf;9QIWFJhkbiT5l!S zN5%OH(^o}5-E4nd9iZX@hXWO0kV8Sg(BTlB9qRBRhr>bz{0)ce#0Uldt;3OWq`cVS zB|3Sj!%+?|Q}}!xk9Igl!7g|BJBMSH#yA~cAqUDU)oi@O2@WSZoD}Bod6mt{Ro9r? zX-}5K*!+X{qqUm_-p0U6F0C4!FoYEzR=c~y(~lE~*p;2(I`#VS3w zw=}sg@I@CNbG>&-&JrCBqWg3IXv7iRFVbY9Ub}UFjh#m$zyw1XuEm zhq2Q4ekJ8vKHz0F&**g4eq5vdI6UIxQ&a5Q&ul)aLebhFC^B0j=E!ckNr&x$i)1_! zy&I7YMxfI72QIFUxkkKPSSMjviwjRkE{L^tTx4aS@Kwga%vd$-^`aRlTG*fME7tw+ zV7g4yZ7kSGG*}NrElwp`bz}5O%Fgz+C>yRj%M;&bNcYVwOu;5!3!nh6<1yhVxnrM( zaH7@iTiNC!`4pPjc-&jqGS>15iUtu+o{$Vs%gWEo)|SPB*11*IG({T$Tja!sc%nU1 zpNENfRy5t?M6APef@|SQJdYRT+=3X37exyqMIx*h&4DsVM&J~hTGn7mTbk9*N8R9~ zZg17PyXHrk0J9o15Akd`a|cyEHnFijHBRfl_^D}AIH4gm;HCx#(Kh)GNqkC(DcKaR zMYU)aT5=UOqejRov1V{iqq}_Zu%%OG|9<_lI|vV{8=u?a*a6AN4Q+>}p1oQ78bGiQ zTYZo<-rlyYM@tV;9|<`?-kP02>_5d2o7$c6-Al1Fu9K>t>wbA_dM)T81v?0ei;5ZUaq7${SI-l^q@0b+ZlAc$KIi0el&T28_ zxD*%hSM2erM$@kss#S9{V)VH#kxLdscb}^*O*Pl&8Z`UmO1>`0iCAZz#T$a0z_;X! z^f$Q!LB1`YsyAiT=6jrny`nj$JI~WrjF6d)kL9>(qNJvMd)|O99kaKPEh8s!fow5dE?g}xsl|jdQql=Fo}fIE5bF0p zH|Q}}QFuI#Mlw~HPPDB_qpoEqHW?da65!tVu^ehVl+z9Qd8h#yE}`VeXS2pRks zS^NaK{8TQ;XBfnT7{)I!f?wiNeuW}_jZ%JtavnkjzsGzY#$x_}B|L%^{0T4eD7Nt! zcF6cO9>*U3g1z#A+Ao*wbDl!QmpqL_JcD1PNdyg+#CX`G@|bDIlP1k1oA#!; z>0n}}qZww>&2ZD%r zuIIP-K&l{-hvk>6;zLng9+RIl?FLCEpCkPqkgP?}P(q^BeK~Z_uWf&|uCzmzhmXWJ zfD~(?-yss@V>U;6gm%XaYX&|M&Gx@5W6KUY-v!F%q fV1ND3Nzd+M+Lq~G1O2}S|Eoyt2cOEE!Ds&iUsobh delta 3835 zcmZuz33wD$68`_!$#l=86Uc;+K(66PLINZNLRi8L>xIZ7tRTm#Aw-VE1T(`CuZTCe z;L!q#0s+MX@PI%-As~u)B8qsSta$5!g6AUP*m^w^;B$B8`>N}`S5^Q2>bqJi{?OWStu<-86Iz_qzNdURP54lInv_W@Eet&wrA4$!kA9k3 zSmHphXTYHz?$1XbW4t14&p=D4%g-~gRantcVm$*6zomb>eT-uZEm{hD#%tlXnBZe8 zCYo&RLw5}ON_NL2QJHM9jefSZn4+Jlk^!cfOxJ!H76ba(&SHE0>|n8@ffj=YTFkVV zWii`gCubs^|3R%SnR6li6kVsj~%*<4N` zy%tZ~cnJ*zOs=rGl8-vqnyJN)ah1)-`2^uF4wTNQt}d$#Rn!DZtAe3mK(9PWSb#@N3!5ZGJ z9t}1(Q1-eJJ8d>_lg-T{@F703u~MJgUY*?M`GSqlxWy^=_As`x(OKc`c*!<=M0ho5 zu&QEGfQSxUT~#fx+ikwc9X2H`HecpElM?$C?h=cOLS@&8r8f`^Rh531t9ljjTUYqZ6U;Rz>+{(@JKRG!>i6fQ?9l0r3 zjyfIG$x4{aCC-9`?98+FqtDon#tN4f^(Arb_a{sc`(CXwdNtcCT!_b9E8yaY=PJRn zVVrZu9)TyDK(t@s?So-^2Mp|R^fZgn{YynE~51sc3i zT;tKvH8U^?8(l35C3qcA3L(h{do_m>ExZ*?tsCM_BHqMP&f(T6NvkOuM65Xuj{r%n zyIW09st~lhlRB4cvoV!DZMWngW;7w~h1r+NP)doTv?J|aKPJu4DH)$W>KwK|pYi{> z+246HJJ6)$E>4Ob%>fU~Ntp=SSp_Aph==<%#Eac-A(W20#db)XxVvNefE}4sF z3)RleqX#ewnqfqH)lG_?drdTj5$bcfp!%BVd>5hBDa4p~gY0_@(I=2eT{WGKJ0m*8 zrZjdeY{HG1U8RVcF!&hy3&}U}mP>VZhiO8!{>!Wsx?C5?rAk48%hkkt!di3nr~`5Z zcZ(K-wQ3FC7UXDYpL69Hw!*`A<+b{bteX6QbMUTcmMUPDejmWAZonrJX{*#KjIn3- zG&XXZ^xQu2Q0?92_eC{Or=G_LqJ^*1a3r5XtZdI&-l;>^Ml#8N0{vu*9p!>GVOSH! zot6@gHnE!WlY~&el=KFjBc1ljQM{Bh>O6fE{pA2MFd$OnWf&LHAor!Yz3pfwCUcsN z?v~r}aX8t|xZFU({&4c7yi8%(LU?a?=I3VjT#xE4=stE6diaA4=$X=hUjC3MiKb`` z=-q%BY0Hf2L~|+pxf`GwVEAV`yK*OVoV9Hw^7PaOcv}YQkead{vl6Ymy0eC}o%1{Y zc3DkPOk#|xLw>}+8Sgp`QDPmDE zCNU}{Z8L6JkDSD)ye063$G3)Ud=0qmAzY~k8*sb-j>!HZV;%O+28Ufcx4KL8#3+q8 zGK{ksbDhSl^jc%BoU;Mxek{TzB0q$eA4#kF7#ZA;Y<_~F{1n4^0HgRBuHr#V3@g9G}LH>>}Wc(ffkk8`dILZ_9 zMm)*dXr7|Q(~OfglB&oYrC6X0j!{v(LPhgxDPQ~&$ z701o0C3mQJ?otWdr&@ErN>WiOS$R~d@~d>wGUOjn1**O3r8=nos-v2sGSxJdQ>%h1 zSIt(P)g7vf+O6``Cn{fktqKgk>S1K4LL*D{H1buEQKWhsLsYS`T=g~9s(!{M)!*2n z1{jTMklR~VqNTib3f&5^a7gWSOWeXywc9OmFQFQxwAaDMeUhzDrB-58t)FXfKvY{L zbCugOVpWhs-A)mwOQpHcL<_%9^qkuP+|_Uc@EQ&Hm)igmRvBx#jOP>NYZUmj3Rcz9|w? Nmbp*l7cx@#^1owdY+L{U