From 57b6a5efb207790590c1449f2146e6acd4be412d Mon Sep 17 00:00:00 2001 From: StevenRS11 Date: Tue, 6 Aug 2013 01:12:12 -0400 Subject: [PATCH] Various Fixes Exit doors are safer now, but only dungeon exit doors will stop you from falling into liquids. Doors you place in pockets you make will happily drop you into lava, but not spawn you inside of it. Dungeon gateway orientation fix Removed excess .schematics and fixed one of them. --- .../mod_pocketDim/RiftGenerator.java | 4 +-- .../mod_pocketDim/blocks/ExitDoor.java | 2 +- .../mod_pocketDim/helpers/dimHelper.java | 31 ++++++++---------- .../mod_pocketDim/helpers/yCoordHelper.java | 2 +- .../schematics/azeryuuDungeon.schematic | Bin 1175 -> 0 bytes StevenDimDoors/schematics/dungeon.schematic | Bin 1773 -> 0 bytes StevenDimDoors/schematics/dungeon1.schematic | Bin 932 -> 0 bytes StevenDimDoors/schematics/dungeon2.schematic | Bin 1200 -> 0 bytes StevenDimDoors/schematics/dungeon3.schematic | Bin 1011 -> 0 bytes StevenDimDoors/schematics/dungeon4.schematic | Bin 978 -> 0 bytes StevenDimDoors/schematics/dungeon5.schematic | Bin 1056 -> 0 bytes StevenDimDoors/schematics/dungeon6.schematic | Bin 1545 -> 0 bytes StevenDimDoors/schematics/dungeon7.schematic | Bin 1561 -> 0 bytes .../trap_pistonHallway_closed_100.schematic | Bin 1517 -> 1622 bytes 14 files changed, 18 insertions(+), 21 deletions(-) delete mode 100644 StevenDimDoors/schematics/azeryuuDungeon.schematic delete mode 100644 StevenDimDoors/schematics/dungeon.schematic delete mode 100644 StevenDimDoors/schematics/dungeon1.schematic delete mode 100644 StevenDimDoors/schematics/dungeon2.schematic delete mode 100644 StevenDimDoors/schematics/dungeon3.schematic delete mode 100644 StevenDimDoors/schematics/dungeon4.schematic delete mode 100644 StevenDimDoors/schematics/dungeon5.schematic delete mode 100644 StevenDimDoors/schematics/dungeon6.schematic delete mode 100644 StevenDimDoors/schematics/dungeon7.schematic diff --git a/StevenDimDoors/mod_pocketDim/RiftGenerator.java b/StevenDimDoors/mod_pocketDim/RiftGenerator.java index 924c08f..7b7f36e 100644 --- a/StevenDimDoors/mod_pocketDim/RiftGenerator.java +++ b/StevenDimDoors/mod_pocketDim/RiftGenerator.java @@ -76,7 +76,7 @@ public class RiftGenerator implements IWorldGenerator //Otherwise, create a one-way link and connect to the destination of the first link. if (link == null) { - link = new LinkData(world.provider.dimensionId, 0, x, y + 1, z, x, y + 1, z, true, random.nextInt(4)); + link = new LinkData(world.provider.dimensionId, 0, x, y + 1, z, x, y + 1, z, true, 0); link = dimHelper.instance.createPocket(link, true, true); } else @@ -111,7 +111,7 @@ public class RiftGenerator implements IWorldGenerator { //Create a two-way link between the upper block of the gateway and a pocket dimension //That pocket dimension is where we'll start a dungeon! - link = new LinkData(world.provider.dimensionId, 0, x, y + 1, z, x, y + 1, z, true, random.nextInt(4)); + link = new LinkData(world.provider.dimensionId, 0, x, y + 1, z, x, y + 1, z, true, 0); link = dimHelper.instance.createPocket(link, true, true); //If the current dimension isn't Limbo, build a Rift Gateway out of Stone Bricks diff --git a/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java b/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java index 1c95062..98149d2 100644 --- a/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java +++ b/StevenDimDoors/mod_pocketDim/blocks/ExitDoor.java @@ -65,7 +65,7 @@ public class ExitDoor extends dimDoor int ExitDimID = dimData.exitDimLink.destDimID; if(dimHelper.instance.getDimData(par1World.provider.dimensionId).isPocket) { - int yCoord=yCoordHelper.getFirstUncovered(ExitDimID, par2, par3, par4); + int yCoord=yCoordHelper.getFirstUncovered(ExitDimID, par2, par3, par4)-1; dimHelper.instance.createLink(locDimID, ExitDimID, par2, par3, par4, par2, yCoord, par4,par1World.getBlockMetadata(par2, par3-1, par4)); diff --git a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java index 9f82048..d4325f2 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/dimHelper.java @@ -250,11 +250,20 @@ public class dimHelper extends DimensionManager int playerXCoord=MathHelper.floor_double(entity.posX); int playerYCoord=MathHelper.floor_double(entity.posY); int playerZCoord=MathHelper.floor_double(entity.posZ); - + if(!entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1,playerZCoord )&&dimHelper.instance.getDimData(linkData.locDimID).isDimRandomRift&&!linkData.hasGennedDoor) { for(int count=0;count<20;count++) { + if(!entity.worldObj.isAirBlock(playerXCoord, playerYCoord-2-count,playerZCoord)) + { + if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord, playerYCoord-2-count,playerZCoord)].blockMaterial.isLiquid()) + { + entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, properties.FabricBlockID); + break; + } + } + if(entity.worldObj.isBlockOpaqueCube(playerXCoord, playerYCoord-1-count,playerZCoord)) { break; @@ -265,15 +274,11 @@ public class dimHelper extends DimensionManager } } } - if(entity.worldObj.getBlockId(playerXCoord, playerYCoord-1,playerZCoord )==Block.lavaStill.blockID) - { - entity.worldObj.setBlock(playerXCoord, playerYCoord-1, playerZCoord, properties.FabricBlockID); - } + this.generateDoor(world,linkData); - //FIXME: Why are we checking blockList.length? Not necessary. getBlockId() can't return an ID past the end of the block list. - //Plus even if the check is necessary, it's still wrong since it should be less than, not less than or equal to. - if(Block.blocksList.length>=entity.worldObj.getBlockId(playerXCoord,playerYCoord+1,playerZCoord)&&!entity.worldObj.isAirBlock(playerXCoord,playerYCoord+1,playerZCoord)) + + if(!entity.worldObj.isAirBlock(playerXCoord,playerYCoord+1,playerZCoord)) { if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord,playerYCoord+1,playerZCoord)].isOpaqueCube() && !mod_pocketDim.blockRift.isBlockImmune(entity.worldObj, playerXCoord+1,playerYCoord,playerZCoord)) @@ -281,7 +286,7 @@ public class dimHelper extends DimensionManager entity.worldObj.setBlock(playerXCoord,playerYCoord+1,playerZCoord,0); } } - if (Block.blocksList.length >= entity.worldObj.getBlockId(playerXCoord,playerYCoord,playerZCoord)&&!entity.worldObj.isAirBlock(playerXCoord,playerYCoord,playerZCoord)) + if (!entity.worldObj.isAirBlock(playerXCoord,playerYCoord,playerZCoord)) { if(Block.blocksList[entity.worldObj.getBlockId(playerXCoord,playerYCoord,playerZCoord)].isOpaqueCube() && !mod_pocketDim.blockRift.isBlockImmune(entity.worldObj, playerXCoord,playerYCoord,playerZCoord)) @@ -291,14 +296,6 @@ public class dimHelper extends DimensionManager } } } - //FIXME: Wtf? This code is useless. It doesn't seem to do anything! If that's the case, it should be removed. ~SenseiKiwi - else if(!dimHelper.dimList.containsKey(world.provider.dimensionId)) - { - if(!(world.provider instanceof PocketProvider ||world.provider instanceof LimboProvider)) - { - DimData data = new DimData(world.provider.dimensionId, false, 0, 0, world.getSpawnPoint().posX, world.getSpawnPoint().posY, world.getSpawnPoint().posZ); - } - } return; } diff --git a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java b/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java index 7b65623..be3e878 100644 --- a/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java +++ b/StevenDimDoors/mod_pocketDim/helpers/yCoordHelper.java @@ -67,6 +67,6 @@ public class yCoordHelper return false; material = block.blockMaterial; - return (!material.isLiquid() && !material.isReplaceable()); + return (material.isLiquid() || !material.isReplaceable()); } } \ No newline at end of file diff --git a/StevenDimDoors/schematics/azeryuuDungeon.schematic b/StevenDimDoors/schematics/azeryuuDungeon.schematic deleted file mode 100644 index fde476ae0ba188c7f7a25b7a9250b576fd509e2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1175 zcmb2|=3o##{WpN=|Jz%q{iMSgjz2Uu<1_PeShZ_a%c?_*UQTmOzwJFi$}xQ9mC)$Q z4%RTkm0ikPYZvV~U=wz4;p1q7eLehr-M&BVG#d}}KR(#DU+|P)#vZHP8KtxCev4GK z`ML0_-ToJC&yTKNzIOHJcdkD+31!)DkN+N*-SX>W==Qt0+t*DF$Y@z^zg0ha@%FbO z`Cd{Bziqnx>dXJY^(|h%OFy|5-snzSUU^UJo_yB*{gu^MeJ5@B`s$Ofd5h!cP|sjV zv;B8XuAW?Gma*-#+@bU4q?O)S(S60eq-H-cMc<~OO|GwQd#ovCHa=gFK z${;b_ed5U!qnppt*y7bDpXAwha5|9N{Jw7TNi%D2?!x7N!y|vauJfF>Z2uQMLu=i$ zpLSfn_FW@I`z+5sAGK&D@55dBCa2jpPwo9TGxcW4w5N}69=!8rTJyd3sdJ|3TI5#b z-fYU=efrxynT=gK^8;&L(mpKS+&X`W&$g41a??{YXINA|`|f1+$9ONtkxE z+CP;4$$9_5>6Bz+i}mwtbo*ug+?*Wn=}TdIPQC0+FT2(o2jx?_+3L6MfA!tErdhvQ zCvw)Yxz~Q{8)V+;U6!03uq*%Pk^E_46H}MJ@zt-ivwr=5`e;{2m(-79>nZK@Y-@JPl^L)2^>(&=M=*z0!s%pQjQh>h`Cr uY&HR3OH&wfR-~M-W%zKxRy+RJMeW_IEqK8$A%>XtML%Uy=0v%>j0^x)2Tte! diff --git a/StevenDimDoors/schematics/dungeon.schematic b/StevenDimDoors/schematics/dungeon.schematic deleted file mode 100644 index 8a23dd026ba97a759028aab4513f57f0f8d782e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1773 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 diff --git a/StevenDimDoors/schematics/dungeon2.schematic b/StevenDimDoors/schematics/dungeon2.schematic deleted file mode 100644 index b17c57f2729725a908663804a5c8f764154646a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1200 zcmb2|=3rny_BDX%|Jz%4{cfkp9C&DMrpPiiv*himzGa!}uX%l5J&c;rwk>n=j4g*X z+d3l79%s3?<(*ks>6@%)Eh;7^h4(IqWc;>S`{Pvq^^K38@QdAESXpu>^LvzQ-JF)Q z?{ELiT+ZQtn!i5hyMOn&4~Ku{|2+9&aoP>57vhx@x1Y~mc!h_*?(FWjC$Dcit)FY= z{C7jfcenXDs){H5v;I%(e!IPD?d39#tpW9hKQ_l-+2$Oz#c%e*hk=F`+4E(-^joj3 zyO{mG`{MR%Zuh06JUw>TmpWVhIoG@R-2#q>MHl6t>00GYD*XIAbaGt2*|D?cqOY$U zKO0^=tK^Q2gt@==wVyhV{=Mm)op#hJzGdyjz?J)7Y&qX;a^;_1|CPm`{;qx~sD1x` z@Vd$>gCTF`pDvWr4 z^2dkX$%c^+RaRL!nkoBjIqCc%^{7>}V0*dxqMs&@7XGQZ=e!~Mr+~>c`A)YZ7jN<9 z{|&fyzd}Pj{h8y@w(|Q&+vHtkULP0r-+%JwN0nzs6W8A<*gX4tyxcecTZb3?sj+@9 z&tFyf|4TvrkJi(nWy|&7tpE1;-oJ!`X>D^S7d_k)@7Lw{f79C5x$#lyPxb!Qd|NcR z-2c$lvw3~yzrViC+h%z8O<2aiD_XbGD_2*`y}Doe|HT%m#Lt!G1%E!-Tq&Cud!Su; z%KvF6)UHYT-M?2?p_wxA;U`nZh)=&{es}F&BK^y0-&(iZt9 zF8#G--(-0Ph8+*z8?WBm)^0s3rd%v;jYb(C7ZW?; z3|;c27>b1-B#TsrragOg_K~;c=INDMdcV%xnc~`Zb^1iT{8P*1b?$9`lePATy+p+Q z&~+E%<=1R@V6}ez+7i`whwj_md1Y+4JL2!o9etuZ!|m6E39gg)R<-wf-uyZ<^)qRQ z)_lLFeedtXnR{1H7RJyX?7rNq?WeTGOZ!Q#|7=%gn>dBI`;OVkJD-CVfa_ zKKW3POPPI=WwHV%ugby?c04LPDhnG`M5H_aWn^fNSJcLDmRSVlu&C0?;t16>x2s z)TkfD&Mz=>oc(49arMg|y=-{yAXM!x9UfZLT~z&PQ4IXBPz?}=|xVEKymDxNW4 ztETJxS(c*aBc^X(9Bfo;Y(D2+$<7~#a@#+yeVp@gp6cZ4SvvQBCmQ{le?;~~$74xJ zHP0G}QvSnN^W1HpZB%DJU^_SeAmIUXBGL2#>3{5(&-*^9QDkBO00S^G7XSbN diff --git a/StevenDimDoors/schematics/dungeon3.schematic b/StevenDimDoors/schematics/dungeon3.schematic deleted file mode 100644 index 52f3ba4b304809067f448fc6fbda82cece53b1b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1011 zcmb2|=3qGY_)7rO|F^gN^KX~P9RCvZ;pFei}thiG1=kq&>!zQyrKZig6?75R?R=xeoXX4$f zv+64AzP%5$+g-ondivF?H?!w{yMs4mhYus ziT3gKZyx?i+<)iYVY$2ZZwjUUnyfqhI?HCaC;R;~b@TiBFFoA8`RLKrvrQ~&>$n*p z;LVmdB5%%rw_@LH{m`IXw(O_O?J2YONH#tHXZ9;4fAQVen}s(P)qF8NwNXBJwNX(} z(d*M@?z{P?ShAm%(Ot~mV}JbW&c4`~l~<46`WWilzob3KI7e@Oz>LR2_v+{q-Z}HGwobOTeOUR||3}A8py1Ksn0qajMMw7RO1>|@Z>#ak z^&-+so(fvewfL4bVISW*r;7AX@6NS5-b$Ha{^7#Ux!T`9>Zi%GYnIx3Z2xvb!S+>d z*LP!o3y-_)|DQXadds%*wDPhSM_RWR{H@->H(k5t$dvg@(+`$=Y@BC2-?Fre;hq@NfcA(3oUkXgF)- zHGfX;>q4nHcK$HYH!X`e(#n|3J-rnyISDwp!7*lhm zu)EA%$BOsy{_A%R{GPYyyZe#zE(hjYFc^5SaW?RoFT5PzA#VF4S{~+XBI!3X_A_c{ K0Zou$VgLY~?9<8s diff --git a/StevenDimDoors/schematics/dungeon4.schematic b/StevenDimDoors/schematics/dungeon4.schematic deleted file mode 100644 index d8787e6d4519f648676a0a1c356d172e011f9b50..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 978 zcmb2|=3wAC@ilpLN;kpr{S^Lm5-O6)f4ql$uc>3#JiYF z{Y%Q*m73|tDy`==_Vda2E`Pc~^Kg-w^uM0#*(bTqRxiJszh!<;>g$WQ?IqG4Z#lys zmh^SDj=j{hkCk5^mPZzb@TJR_)t%!{m;aiSyIte6(fPi~E51BB=>Jp0dVl`jU90bQ zpNpH>`+R;$c#^8UPuc43w@V&>(dhPAwAr>YYKo`O+rJl=#Pn`{c2U)Lb>6Ph&o7(O z*5>`&^Je3<#i7gG_g3tP_gi-JVP2tuPj}HA(Wieh)jr2dMQdM_`fIjIPvonsyiP^Y z+g+90^Xwu&%&v(rujZb0He$AY_qlHd)_Tzs|HRpDUi<1>Wa;jxyZ-|3<{eW#{(Hs2 zk9t*Q(xsQ93--Lfa&|lSthKDyE$!Fxzj`)(y6@{ppMQS%|37eB+|R{-UTk`Nx8`X@ z^hN2XMhsr?g$9z(k6yfY?oHq3)qB1_I{ojapWVHgKFikLuvnuvNBrvR zjG#GNJ#+rd@LRq7+u@Sx8U3r4mwwyuKEC3{`E}nDck9cQ=~mreo@#dX^2NfEeNum| ze0FdA^);jD!xM{1y~md`fWQH#cpY0C-sM~eUh@a-zn?E*w)e?_mG??Jl^d2y@452D zwq(N^?R%XY?)N*o>^~{G_@i@ujq-lUbulw%E_?d2$T@FfgiD3?p^rPY5C6Km(a~am zrbu1n--vgj(rxM5!r|?ID{sU<`e8kgtg>h4hPvaq z0{}DcjBYN8;thJd-R%8)HqVO9%_6;QFYDy`9jmz6 zIGa^WJn~N}@bXM@Jfy&xe|7ttcdr%x9=Gi~u8=sP#hYLM=beunyh3cA8X{Z}N=k)i zQh41iDD2)LMf2ptxgLeRC9}?5Lc@cgaSE1gsT-o z0c|+x?FchmBx%AP5uh1R&D+zOpDa~?IfILLlH;c!0gz5`@PmjQPj_9s=Xu%$7$=M{ z!Gd5RcZLto!p`abjot2fV^y8b_pa@BIdea6Wk2xx#kSjT`;vF4Uy}i<*Xe$Lh%x56 Z^t$>VFwI2M4d$QBLmn=doh8S_002p6y|@4X diff --git a/StevenDimDoors/schematics/dungeon5.schematic b/StevenDimDoors/schematics/dungeon5.schematic deleted file mode 100644 index 8f59c30db1a47ea3bde85130e0fb653f59a825bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1056 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 diff --git a/schematics/ruins/trap_pistonHallway_closed_100.schematic b/schematics/ruins/trap_pistonHallway_closed_100.schematic index 064b26326890be75e99fc404c308d2a0bff49c72..e7b891e597c55309802509234399312e21d72fd1 100644 GIT binary patch literal 1622 zcmds1|5MTj0R2?AY??VWwa&`B`7JNVi=kAgES2KiqbX7<~5(1$47Id<2eZ5)xYX z=9uL>BNohKiXx8{)5e#kJcxf>@VdEQY-2b_g{Z_S$hCb=GBl`|iq(Jl006mEIJ*S^ z3Tj>Os+5wTo!e_}(?$YwD$2>>Nts~~o`H5HIbO#QTbGNWbnfA8b>P?%2v3qMmaP5;|@hHVX?^PY{b_a?>@wiV(9tRM+ zq0}|nOQ8eR6ZsC~!esCz@Z#69J;&AnrCt@ay)Dh&V6P57t?#1Z`{Q|V{FIhwI+D&f z9w-^N>X8RI0AQXGNBxujUy?J#vMhV}Y6JOOTe$hE_~(u)Or^mYuY-$uTHJI~yY6iC zLLkCCrpivyYC7tdo>8ugoR%PJ1!U8ai3j#a^dAu$Y|_Qz0}Zcg%H$+wc+8|h&qVyn z45hm3Uel_kaU$}QA(tY0TEN;wM|Y8*LP29XkU~O*bGuWRDCxT->C@^BG`+#wZXH`P zN+SYJ(+EmiSH}hWM4fiJX0FU$1v7k9slHc*<8Tm-9vHC*DqONf13;%pE^v90!+W{n zVROpV%(l(#iv`_DZhlx!v0}5 zf-Zj}xi2RxSqd35fqr+FZ732p4iS`O9ExOD5-G6@M-P8C{WhQ@wKbE9=S8quphC%b z!nPq4oKIk_BCue?1-z#w-`v@o*k;iSFvR65CoTICrtPs5546Zlv)#d~NF zG*~0$W~8!46E&)yG;otFw$0ejR-o2_pFJWBR=Z)bKCI4}eG+8zrZkQF`Z!k$2USM( z&A}*Dn-hLYy|Ua9Sw1||L#%Rf`Vr#zsVEZ@uYwi~REt9DOsqNF02f5ZYE{G6&lBLM z@?$bi?#gZSZ!bK_I>|ra(OOb~R<_(fMj*;%jxHG&Pw4M?U7%!~=Bf)9i@&OGAwA{c zU{qoC8-Di2^;=tO_Yd6XfxdiwC`5 zyOywnqx~RmM)a&R(i4%<$&M%*elB3pV_1%H4ST;1{fQY$K7BCqC_4Sl14WM<63Ugsm4Rj{`4r} zxjQ?mR!;fECh&Ej0YR85UCJ+c*YE=f1OofNk-wkt;f#gp3A6>95Z$HE!*0c|1bzoH CkmS4o literal 1517 zcmd6n{ZkSK7{^J=x|UY+Ov$&>9oTW^)FwIws(D(zRV!_XLRW|(A~_LKOxvk9&T3e)xXx^W1&EcaQg#O@M#L zsCty}D$1iv6P;tb8y(#8Ra8|~hm?l=z6cFs!FicLoX2zB<^{`f%5a}nL7H$-D z*Y{bF?CZwXGc>nnQudbtBMOptnUn3?&~WR~rgVf?jc4Qhg3r27C%Wmp<-c74_p-+F zP-6+|v*Iw>v|gqxfL$X|di*(M(5&D%MODb$UekiXO;`=h4u6RG)hOBG_oq~1kjuT% z9BmChl|T!pp4n+;hl^xC^42XsSTw(Pdo@79j{BC4sqm&<>Cz!}Z!~Vb-}9ubn;+o$ z1>+K>E;^){cHUl8rjx%XYL;|&IhU}LIUWtslL<)JP;79$*N~ZKn&Vwvbu3DUjyp3H zOIJ_i*{7kAi*vx&GY*KDjh|Ec533kVgmf(F=SF8oXSI5&QG;pZVzv%C*}~wVVe!?b z1W@!w6n@1rPJi++(-)>etgh+}ejVIlg}B_iD0F${Nj+;%t#xGspwork(^)KM_jCg4 zerNY1Llf1H>zyihU}7<#99y<{ii3)d_H&P)GTCpLxY0&%bt!hlm1*MNieq$L$?sZs!5P+=VeOfl5iT=97Dl|{ zmP)H+3vpXRNagh|yUg>0)|9tt)KGjfVFyt?69Cyiq3^J8NZ=!R$Q!78TFtQuedUIM z&D-+w(~j}&BJ0q|7aTwZ>*S7a)~x?GDfnZ9r}nQ95Jm6^E1AqtXEhEW$`EL)-3#5x zt`Bq5Ps2VsF5wrM<7XCdH;XHjrZVj87Fjgh)@YsHD9 z%Z6c*6a`DBu@>e7|56#wDafO5YW#;#Q1s9#Ddel*X)vm4`+*4;^Lb?L1MN#bRCdO_ zuph`BOTUFP#RuP`v!nw8r1EzVSG zA!5Ozo8+RDD=|g6)_q}&Qj3`Zg)UQ_tb-cYKTNxwPb1;R(oH_C*P@^2cj=gXy@D~D za+caparXdn>pGz52+QS6tUygw;