Wŏ? W|O7iQD'ր}z~ } W ڳ+ɺ*垦dIRH)tBHcDiLH
$ҘDC\+I˶4hGFœK~ri$ġ`|Xzt"p9uL)ʡBF/X ʒ)iŶu2d&c~KC=Ҵ4)T⟥?YT" z% ,壦V s= mCVZ%Iܫ~?xȖKr'ʳx1=|{s3B_1gL-_-/=^,ۄ. Ս
+; 5Ug 7Ɲ>f|Gy;;_?w_Zȝ;wpmo~~YOW8&R
+K?a_^)]2_XKԴD,Ă9ѐXt! lo}|2khVeP /1Dh8 <q>/+_6O=ד2>{lY q=w_vkO1>.#\_5fa5P?3ߔv>YrX?+? χP7$`-U9*+U|P 'As'@wV tgWa}>4rn&_!3
+X&K8B#3?3/1'0f~Fgr^Dd? y\$ʍ;ͧaYQY I9 mK7xy|_~8Wx=^c+? .c^ݻ w 993??a0d\0mӡ\!Er-c+x&S
|Etgpf
+Ng2,|S02 30j^I
+-M3 Zȫy2A Y I19 E/(yۢ|Jɤ҇}|J}<: ~/AAIr W(r}Wp/~I)
+$sr,f 9% ɩOLA\B2b㓰4>K XD-bI^EP
rxG?4(ڈUؖ=r}7yy?Wcl|=|;ܽ{w|"w?+okv Oǿ`u뎆'4-U4 5 dK:A+osM2x,` Қ ]85 ᛂQs"`NΑG^#.Oͽg@s0f~:ƅeb|x&&Eecj2Xazr> U e%p-({y%]ZyH,)U9/2WR^*!r%V fY"2`n:GiUȭCAY
+Jʑ_Td!#sҳ $$#.!KS KK$#|",Dhd(/`w8%gܿ?;wCP ۮ_}T~P?'y2^kl`O}Kz @ W=_f+v qq> Ub=?9~ߋ8= |yG }$x]x֛x[xpۅ~|gZ M!PFP3DOrpd%fAӲOm4<xȅzS0n \ca鑀މ0 #hRt!Yt2v #Sd !i Sfj2LnjB85e-,G`IJ]R%W_I{8g?3mKmIJ1 "9#HQDŀ( 9sQD9GغQ19Ꜻk},r6ʺw9s4Z뽏9Kh^27TfcO^ 6 AbZ#*51IiNHBdL<#c'4
+A{"; ۹[wa@xo
Nl
}Ei zy nKvV~7G5Hn,BÛpG7 Z4iNȃJ )_"9'c!Ƌ⽈|- L2 ON\>^`3to]920{[@5iJ-BBa J[c߱sw O_ǏgQsA7_ ;?o?+< x'O u&nkpQtt
/IKߏ dd0En&M[I3b6LډI{0ea(),Me}"_`e*k! OyCj+40۠a궛܃>a f;`/ VW8L6Gbk,aw"\B*2 ؒ (GGQ
+K^t!/~u$Adl s':ٝX >q ߬g#2 1)ILATl£b',{" ;C A ޅvb X凵뼷cV{x`Ūepr4'p#
+xH cp
+^Ǐu =0z =O8& p b( WPE۳0zPOZCuEư2
O_w"?g>|oիA< Oqܺs _pQ 8҅zT7!<i{\ -hTy*·#fo ?,LM5eSʺv6& OMQ^
Y0}=1b fnl;_hnEޘiN[1g?
+{ tVΊmY ums ջa6&"`)qpڑ64^Qq d K9ziLSSUzv!(vT3 O `[vBU '#&!1 Hl-~{w}S Vymc Vn *]X ^{mޅu;q Vr-̍Pg:*f6V.5FXT6dU 5q(t z_;U?I̛JDs_ƫf1' =}Bm8?A Әjک# `Hz)KPڃ.}<xo8b7+aW4+@x#ܾ{38z @sG-
+QTPdlCA/,3y
+aUiY&a0 ̰NS.4J˳n
UÝP
9<j: 0؈f0z3l1iً1\A{K б ]Go,pކv-&`>
+v^pʝNĖx숉E`|8y^B~O{ 5,oJz:rST>gX!*HGJFR 8
+VPxm%an,
絁X6\t 'Ϝơеuj(BqUrK#Qҍ(]1H)N
mXs ]3aV UX
+ 7`c-6VdcLCy
+t1_-uk ,<0r=Z 5в\90oh/^E+m -atsa
+U[ X=]QNDHsoZzRs
+RTfWuaOal8?YHq;jQPdd"5#C> $" J]p^ p
QX
+b}6l _6m.X86Vt<Zo=?R$/9QO':+t7X?
}wc[w
I \P!>71̃D{b[3a?0
+_8~}'_z( _OO?q 셋8v 9hjk@U})+[@d{#
i%v|Wm a0_pö:XomX t6;ڷ N;lW= U|]. Ck mo&6]m3.|S-rXbM`
,\CGh!&!ph8o- ؑDL@HB,"x$~33RT!i-8@RirJ*[Xlz679Fzf3>{n;` \, (hn廰3({b)$# 6v 0\Cdɇ٪:7<68/)`BWTc{^ĺ?/Xlˏkx9ue{eM^Yˏ GvY ˵\RMtXVbj| \dĪmXK5[l 8X%y[u/q#S=g'ob7|H2] se ؽn4 ݄H1gas7Aǵ`sk@mhhF)"+xϩiGmK7x';_~ jg!KW8z >}]hlkBU}+[0P@F3
+MDu%QN0cƄp=:@T5v/b%ZϚ.b`i[w42 tV_W]}m]k.Yh< -00v/mZLk,t-{ZXGC?Țd?oC ~a>J-
8; X5x/F>pN S]3ݢ= l=Ox}|ݟ
tbעݹϸDq揎K/859IӞ=<"
y N] > ~/lϿ ?|Sܾ{ } 8s~n?b YǬ >guz~dc`) +1
TyYkOs 螮dr10a_͟& I)E-EfUZ{r7>x=^zx 7oʵ>xOӃ6գ %K@RF(w 1nȩv@n%2LP`G\
cИB #E %ܱ\; >z00V8ypL)MʦOd3t1i#a[㿷Nwx4UEbܛFs+ po };蚬f[60uŒhX-k,+ILCrZǿWwK R{ -w J_|I 6Ƣu[ /Iwax}EE 6o*-~TV\L9uu))g]/?֧= dY룗+o}5>yjo?f-߰?o&?r ȷ\u ݓ( W{ˉ ~,?t q sА#Q!ObE)gF;:
? -(iFc>y փx9 gx=|[wq_އ8|$ B{WZQYWBd#%3q)ANElz,GV 2+Q9fH.q.wl L "0ej)G@p7VoDhr$8#8v jq 3fsim6.|LiL%04؎(97̶gd|t}@ߔ-pIanls"7dKјB3 t Z& Fv0qc ̜ba h,Z k72/Q0!FKKbZߺ?<6 )Yφ+ϟw ly_lVGco0c%W`ւR4.~'(tC^lkw'
S.`绰VVT={Wvkv +o:uc22شi:gӦ233 }5f5w /X3a{jo?amoyn ;3NqpN&?@Fz?p>J9a?=C1x<ᜰM~%5uHt
ÿn̶oZ_[ )5H+oBa^=#gp=.Fpܼ{ 7nM\އ \ 8|{GKG;jP^]ڀrFg 7@rZbi23ua&QlI{hf
;XٔKȢW:#|;%8x!-C#G#BZ ́#~ <Rߠ3uʡnP*W8Yœ Z ῬihX
X]#w?fdK
+SR6cb
O_lw ߭OY t
k~6(7#;'v͏'8O:p.`x?{GW
rdB^|'O^ѕ?q/@Tϔ¿I0lm.C}?YʭFBQ-WӊҦnۏѲ: žCǰq !;k| ¾ N4U5(-/C~Q 2rґDaW' = 2sX0I95yyOu;݄md_op?}Q,l ktBڠd'b?}S ntDFKr ma8hq$G.!!v;4Y9ejMữ~kkk9~)o@Ieaq ++%:5٘nPr6'cW4$Y4u1Cr7? >`cι<|YBua6OO?-vll"fzM
+x33k~-װOXg<Phue?x
/X7X٠߄u1W Mqx %P] _/z5_X[=L[oƋr}N̘![ EA1
+Wbw2s_nB&# B,/BZnRH_i2 NNzҝg@ Ӛknasw
+<c.fz`Y_Udrb QcgXoC̗$](ӷbk3_ {ۜ\d*WRKe`do]; + ܢ@؟2%ao
r2 I7t\זW{I"}<)-ky8/>[Xã d(? dMx bd/0
+' SXOY~\ / L2zۨ >7۫3L8")g~Η~SCuɭ@BAҊS^6UmnC]K;ZH҂fkyܯw..)F~a>r8DņcOx |i9giԷGT0]nOV fb/ ^wI} ?hL Qz&.0C8̝aqol 5tf9 +~K:rYBΎqy6QPm%(W6z21%sxǀ1Qh 0_[=iq)i ^_eF}l&@KJϯ jwS<=Lú;;J[.R6q:30TT,YQ%ηaobjj/L`TUM8=|ͺ k xj?e7GSVV{ >/9 O=~'/~2>*= OFا|g{ AgRE*T\KUr$T
+e(EIu=kPYׄ&44u&5Pᾪsr~ |n^sJ*/.q F`zb尵 Oߣ )5s>q*慨?}H~?j|\ ]ڤ {ysB $Hb._ K2 3 %;Fʀ cBnc0X Oq18 Q8Ə~0<Ffk1 3̈́3eWVwJ!yg8ȇ|_uz,h~>ٵ}>?Z]mr|t%ϙΊjβ/?1em&#xl ĺgX>{ͺ `
y/_ۣ Z|Q BOP#O~AFc2Vx>
+=}Bm8?AƤC֏OI86b?4q9eH-(GVqJ+QX^WעU&瘯Gm] jjkb~JJQ\\ ++HJND|B `οMh m9b/͒ctݍ4 jC^g' /')Ͽ,[;L80_@.2. K}jiؔ|/٧/:O:{xܖ o 'QX/G \LLwؔ)" e]STldwd]Gnמ 2Gdj^dO_K{96}k~M_A> x3? HuA})B) g 76X9kyW3A^@Hdm ~I$!)-.CQYJ+PZQ
+W5hhlVOqUQRZ¿
WXXt$%Ox$$"2*f
Ewt9ǧ< +N"'2ijb
+VPu9 ?O x:3Zr@B _} }}XO@ ¹!:G^u@[ ! ByX $o;ZzXlOlK>b2
+WBQ
+յ< +;hlloqa Y\~~~>yy97d"##7b_' /?;]Vwe#5EMkf{=#3[`b=sg[o?po`f).)_)l'iyݒ2'/? 7ƨ_b5ܲ[Va=*XQߏCeh䌞P聦k5wD*W|p-;'L{4ӇMu ˫c\W氮Y1uu[abNeg?oa_|`_~`vßǿ{ XưV ly$뱈f9|e 8]f-{XElfav;N; bWWa}ؙ%ycwyu kg kr.͡u}P6lCJ4n{jecKHQĿ"##U0ݻ#Gp F9 #wssc~}09n^樓γmÌȶv/mNlYx/`Ey8`o1;tҾǪ^Jk96f[!Bbid; F昣19tL,clmn柯F12]MLmam[K8Cw+-BA0vXX#QJC|f"s8ĥ!=7 Ey*FZ~:2
+3Y4 -/ HIGjf
+R3Sy615Ie7ﳦGYӃ~D;'vO y4euwi>I$n h4 >̢vuA>v2'O /v:v̾+nYahkpjC0? z#VWVw/NF
+/_ ~p zFD{i*ip3Gk!87.X K39 <%*& V19+s\1s`>-lzZ ZKt夋9K\ ZF2 ? re6Covo ;`c;%|] 2_l)wfl.܂m~
+l+ێm۱[+a[v,ۉ AXnsBf ,'1QH,Cba, RhfG8=5{p4n+Z 1Fp:VoGSq +ye]doċ߳ȋ}, +},b/{K6{b~O1=]n,a?)cۯplo) +٭kNp/ \[2L?i/Z:yStjoss3jkky'!b? I ! ]j, Pb,N-mV&?V(I^ vB? R6b~+"C3L03;BtE]Gd۴u>}C}|hmЈֆz.ԋB3 -1+m1fG;c W
\ݡ bV }9aVov[Xu.u-lZmv
Mou]l `Ky9Թór|JK}W;*aW ZȊ+߉lCMf$m@_rg4 8 ?ؙ?3?ݸnbï웟Xؙ+ƧINb9q~N:I Ʉ+=?p$tO:hL&<Ϲ¶ˬje
JC*N̷
+TM Ȩ{bf,u)H)m-=}!`Wh9) inM6&䳆.b#$|v}l'V7byR9>3 r` èW :0Z%,¬BshaFBe@5c>TB5eT4* xMJτJՠܮ#*P>1*ֲ e&mEf E*JlՃP>=5rZ5ڡQY53kB&4kan6 p^5UnX[
+jWc};6ԯWZԭŎuZ5H/\8[a6eU:~
wާ/;χ=y3kzE\eG_}=?'tOO(S'ޯ3dG9
das-hYƊ=^
+4& f}'m[8xO= \}' m7aPF! X7t$DR&Q; ͭ\~Kj{iK d_öR^k&KؑwmXY.ҍ0\:4[b^1٣YBԏƌcP;> gBTCB WO ]JP; Jӡ1
;-2 Anp4ތ˱Px8 tB*աzH *Gf`qeȝVijS0x #'0
+$C4W6C3|,aLZt`֪ 0ЃE ;`[tU-3Qy̜sm#q$l_p ;=;8w?Ko9Iߒ< 'OZ'@1\ e\qx?q u di=ӽx'Ox?y6>ɮ\˸?Q CFz;rU-ȮoA} '46Tz6~I _ ϐ
鏠j z~$}/ Fd źz86{7,`T
+[h7cN404A
+fW%e]QU^LWre:T.MiP9sP9#2
+P:-igBd1{ }> rގ P9z0Wzeܘ 0w1@9bpzȺEEo tJ 2)MV4W~Ua5,دj0QA%=0sUlSBT*gnFǍSIl^~_Dr翲wOWn<X}>7 B^O) Z =u2 HSx/hMrvU=*B-O:Ҋ8pY' ŧ 2A
ynk4OqqQ?un I_K^: /{|D5NYWCsZaV:4*aq%Y^
Yޖ]yWnzG^ ToA{9Ao*!k d!d?roFC~`,q>rϿԁ1x^ %?ᚰPqg ѵa4hP}c~l4OII}uvfMڹP1= [dА3}H\[i bGd O^7," z:{Ċ>| Kz_ /`x?{O>?q~y}G&|I1' @ܟS ֎[Ab \\|3=
+,G>'8#=㿮 ~|A2/i $uHI#\KHI~$NᙰOuL
+\Way
:P~E ʩP>?W&@ P3J&Ad(= )"{>dϦ@d<Sr
+TMIvo< |ǣ0) P 3@5q ~h~'|= :G5`h C߉Az(ё@a{F(|93.ƌG9B0Q84
+>jkyox ~`=DdE]N3ysΎ |.C/߉MX'`h]Og@7a~m3\z ~/hL=G)~_ Ë*|z\$/]H /4H_:74pOQ 4':FyK[n9;
'C8L?9Ύ1PyOI f,LX(˱P|>ӞŴctw}02Ap/|m@f`?S2C@~O@+!S'ь>FCt`j#0ۄgգ`tOqv0X0c99aWsn1},Mw>r~c>٩w?ƧXkw {E_["PX,/~[9 ^@^OZ_| ާ9 zA{Tl
y ӓ ~ \$94 Ja=tJU?ꝲPGCp ?=
+rWFA(L}6
+2GA=0 aޏQ}Ⱦdl? } L< /FAnd.ˣ so^~yN(L<0
+J Cx'S `5rG8 `cb %2Y?="Ukdcu(M: k#?h_ vx#B\f1Wnr#]vǿp Į7nc(@\> 뀋3y{1s|夨uZy>
+Yu`
ٰܘ iu[Vm \Df#%M=#Y}߲_#~ u1XY% [BJ
S9ӺFA 1P8 nqP|;r GCG@X(} O߉;wO{;c08L8 1Z3) pv,1s;~`k`KWP9J&A~gLD.?(#UimbXWNJD9
+=a\pOcٯɏfcԏ}#<7l߸N]3;1a^= ~ ( h| @TPx?a-h
+kn, 6Lkr;GU~O>bOl2B9c@tLff8(p{K/x$B_2K|d`GQ0]8khġff4NrXLo źѐoqP=*k0QI P| 77GaMhV환]&Ch4SMbX(#0~ Y(Rj L>C_=yq(q=ӊd0QsyBf' 8b ?s;Rz w< ` `3篳P:>^COk4&1 O}BOP#O~AhLFcTM%`K=qEzj
+ss ^~17;[{K ?R}k ?m-=p[B/J҄rdFA;L+ 1PlUau.iЊnAQx= D~!¯lߒ[W.{p)7 LjhFeΊ>Ղ-9֦MĂ\=X8`V1?T/uMIU\ }´$ \Fߩkv;r{'v;w*#w Or? z*d>_ASQ_$_@ r-/
+:p&B/ ? ":,7_8{-5~@#$JyJzqLBxDztkzPZ. <`y`
ؼ04VlLϝ #`3'`f c1-e2ǟiBl<Bz>E:(O O7`q_ bD!yG`y'
˦4f*<$O`-'߈%Wlߧgghc]':bYnʑM)-ZM}Ms쒹|]+y.LRr7ˍK Z5 F2(\ؗ0Z ҇_ع z_gٽ_e^"_gy7ﳓ~eg|]>>'N@ sCt=}¶G~8zA sCA/
1ja -sگ3eXb
{9^e03ZkҧcB*:W?7yC?o>
;0C9T|j `lij&rhپ ر?$Wڦi<J{khܸؒѻ$\?܃;aF?UݻAr?H=>_<| ![$JC<1P )/m.5#By^Ns{ L^n-sq,ǍNȭG69iEN|9%s0}g?ظZq71vZ ~/^!EEE\XXsr^ 簇2UD$NKK㌌ ̔6m۶d qqq O-{7C(::8>>SSq۶9,,Rd,22 كf:>}םˏw}qJ!;|ϳ6Woë'#[5Qa ڣa3f n",/SspT7QcM h 6Z\ hMeGHl<"3+&]g{d>֬#ggzʟCoO~5 hAІ a_z%s+W*ڏ}zzn;t MM619*6[QN(%%]Xh [症/
+/ ~nUK
+A+=ڧ.]3'/\h>>K6> rǟE臆w
+hpǎ ~; |hs/o }h
+)Jla7{i
3 .Ivmq` ʸaG7$
PNvoɏ0 eF >#.: _\XqpO4n`gϞ$ٜ#mj6I]p죭 a\U/::"!11ަMyhwL,1@ll" 2YC \W6 mo/o*5 }ܲ#P۸:u)C\VߺukJJOݡܟ |}QX x'Ư/ɞߥOqs6_NW 2h#@ !: 1я6 ^+~ k7Aد4 j؆pSZ Ůvɟr~#\EW6<(S_o{wktջ1`Yh _f6Myy.bx߸7o wddEPTx oq =bAC} #`L[ P.=U#0Zͮ
|>|yY!|ߦM ߗ^!fK;Zjԫ`#JZ+d !ۓ ɧF՛Dq֟s{ru?<?`# 25x*9qN 6 C$G,
q !NJ~\81 鹚u) G+Z-3At͍;͑ SCv3ĩK.3'Zv𗦺ョqďy'fGG^g(#.߯kp Ǥju7PE!zУXA3 s0w츩Avr~ xE%yWR<<`_'%Y'md{puAm q@~b ?pG[|ސ32W0om> zmZ:r dcޣA-H7}3F I8v/c^p?7b[h deeaxrI|oa˻M{}?0 Gܯjէ pDE>b4a>#CtM[oO%J|y_s>*|=V>(^1+""[la m l#ϼpF_>i `L/kzQ[tx
+o;¾$ r{rui?AvÇCu=>1H:Qǫf@9Ba g?uxU(?e\kƠoPW} ~Y>Z 3`^j# bAl1Mv{=w. Z^8;K??`'yw t*zUxlj[xЛ{K8euOG^pE@Qк> 7~]hّ3wrLbz~w rvrn[;ֵ>yԢ0SxyY䀴X ?} y9>oQc IBA5XKR9)-GDHCҥC4_r
3ZWߌ5k1k5w6k̤C/ozsf+h0G1]<f=<xy ^{pl%&eOϾq&s7"goX 7g h oX >zK hܯkG 3vL~4t}#zؾ[e N(MWsЎz߆s̑>NnJq
+2?
+ 1ofܯ9?P~Wf߱^ .)::Vh
6昘 0x(--^M ~r%_g}ʿ+z5(MJu@|ʿ~ogq栍ܩI& 5Gܮ>NJ+c#qV~} Ik|?7,1ǟgjN_t*;[J,qi 1C {i]8 vAF frah` ŹY\/}7eesOI_PQܰj17"}͆m=@ k]cz?zhc7^~ (7 7~hk~ؿvPxx$7W_P &7mM kn,\)?&j'̟ k мysn֬K&9%{KߧdZ1o1}+אX٫O뀸b؆/S ߇
q 9hcxz 7F|ha{H;tgfrDB/κ\v? Ԃtƙ; }67 z2X}<)/qܳ4, }gu_s{oyXVofy(R ʐΝ
?(a ,>-| 1 ]g?_9m e?=s{4ܨb.wxz c/!sn?ZuB-ЎQvkQBn?Ès %} `7ec_ 8c r{y ~t= ]~~uAzSV|2g
OVܰT3T7ɜfK >OKl*E?iK.r1#⓿0g,l6 |Mfx5{U4U}>~Z 6 yGOn үwZR|vLWG-̿^ eC >^\-]?Y GߢE a> ߏ=Vq1 QQԿ_?cOaJ rPJaQ7n2}4i*Ӟ]o7ƛ\5|O'ue_|`'y@]/@
P|5vAs~ {yӧk{au0+gyj'p>Vˎ&vNy;F n1ӈ 7en=n/wYrE3n-MX|~2Xϼ^t|ʔ)tOikoRkR?\>L[XQ?!aaQN-[Qk`b]x .\VfǺ ؕD U D #732X.'R;ۚ_o/a6şh,S W8'!u7 -@܀ Cw g^@
gy_\';8Ӭ4κmK=:kvQ^k/s@a=QG\ќ,ڏxs_~e ~ uLHH1m3 7n
+f59mc]܆χh[wt㦛7%7 3@Wzko ver2=¼gx3 Xr[^ƺ?WlՉRpox]+mtO!Wu_6{ /b^xAXF=OUЧfqsn?`v#{k¤ ?hZc hU0#P\pI< `hʦ}8 WW*%ؿZҶ~>"|>> #| !W5~:n!D*J
&Wn
+L{B07ozD-?~l
Am`,YREE yhl^_{m/_>7o^[Y&
Dp_X8LAݧ~F'1(b {R'q(zY sƜ&4Ŏ@?zCB U'D>H>6HJ0QEroI~Q`4
+<UEAϓԉ\QԜ*'S`p
+ ~zoG^yzf zyv= Wn~g?N}
+
+K^pDF Ĝ#sr>a(rQ >B SߣϬ:YP#[`Zޔ춆dGuSl>ۈ Pr[ A6{9\]) ` Mcߊ"vdzkHGO|??7rp4:z]Jb쥨^Qxw{3Ph8c#5hLZ-Sz/Q=(J7 Ѕ2ߙJ.{ 9QE M~DwS%G&Urv!?{%-r itNDp'W[gױr7{[Uچ/ߺuaI 6 |
+۷o%KӤe4x:zvf賅JQݷRX-*c35ODMRQĕT?f=f:
+ C5eST Ze U G) Urt%?{ё ){S/-`u 8x|!۷`ױ\\&ʓ?Ȯ뿈 _!/\w./c;vSQr}k>= LIm)%5R۶INI~ݤ+ĬoYޞc5AnĿ~ A A_~ʚIobf %wT7#w@lU h- > q<8a O:WX d sΤqeԣ
+Jﾂb3(
+jBcR0lkYHuC NITUw$լK5R\ CUSs _"so /R?Uq
\ȥ { G~ il{bg] Mgpgy̾C immZ{JO@gRZz0MB תU?9 u9W ο{"<ꁨC %{x WX g{Pt\|5BTLK k]P۸Gl0gTżh|8i
8v/9=ͦfQ3ah:ԟBuC&Q'S:cvTUe C5Pu|
+r ӛl}(9WI 6Ke8?>щo5O3x¦Sy۩ /8X!Jx6uEqIm=+hia JOK@i@oЯ_ , ? \տ+jV߹ <s<TP5Bj`0h8ZrүД*5WUPQ%Ԍ-@.gۼmf! Q 8!1^bM0z*mPDԬjXկ7Lu'P:)8[c =Yc թ>jWG:ncۿ { oU WRokW#ǘs4f9w^? x*yN3V+Nu7b}KӇ; 9؇qq"?o?9`.}=tWCx߯=uoI]@ýo5 > 7n8@UZyyr+{
+ P:bZ dd|4:o&6"PhH
+KuғUnR}$ի:BSHh< '>fXmmc)g(Us eёKd|wl+؟c\zq *_϶
+[^Q}4awQ#)*.k{%q
+Fc/KgN锒F)ޡCGIḃо#7lX[j- :z,ʿV7Ct i>.gF=Ko @kfѺ> `|#G }a#6@ -MC)Y 52j3j:)$(RyT/0BGSJ39#Y鬒@?=Hal~ ~}uߣW2
+̦FV*` bOo9зmgmM QxT g 0ߏK" 8Om}; N~駟~< }V,*ך̃K/qS8կ[ ּ_5NPO>Qz۴iF{{Xp
A]RXlzU(R>jeQ݀T?0TΧTR>rQU{6Uζ>| !8Ї9:^A?8Eu[qڀ\)(4 .\k|¡<|~q\16tF }*V[7w즎( % 8|*N#)_}o=~cO؟kY Wr-0:+k4t
+5~S^_vE_|-"<'*S 9 |U 2}_=7>wO5a DD7z
+xh
s?sǻe s;Y= #u@]} cms&N .{5w֒ Wm3 ` kx { cOkL>+Q=< z| ~x(Sx8Pp=3FyN{У?M|Cҝ\ugjO{q]8v{Y Ŵ?\}Ax'Jxx~V>u/ Pu߯y ߥ9-G}i^u8 zuO!]М y= NB) >ρz$⋄; yl=M!> |:uz+Z@jN\-p1O=ێ?#7!Lgc,zO[䚍pH8ߪ#
\}#rCX/Gxq7{g/ƿ^U˙[CWߺty{/uΧxDv~ ߇o4Xg<ۥgrM8$\ߧ hcu}io+V5<\m 5|[o[rxߺ [!uX3A^@
fLA]
:/Ta W#]p{=N3=| L Jf ԍ vdi ̩0ȘH&_R+\n j/r惥 kuC39N7Jf.#υ6 {6ymwR(.%}s?p7#y]ۀv~iG{뇵5;W7q
8 )z.Zz=Oma'mYl]4k_>zl &G~ {0_
͜1z=;"/%?F) c U|$lu%{D¾6tǟfgW Jn9h G dHF/ l#> kӈnLʉ= lbmwMgΥ^}>g~ٿqqFڵ}Y 9!Chj:x|_
z3>iA ?XV߯q=^`[]ߔ[薓>3?
+~{Xu~iڶî{S #f 4~";woIZq\.;'c%zӝ_>{;A|5ey~з7@$w{wڕt"ų?p{;q 9M\6'k7YΙQ
+Ilۊ?d_Uw )ս_}s0J㻴_m*^qis1~; r剳عa?;F[ͼt+,ɅM
zg,r)7~Kos.%}2q_s}v,+Wٶ# =E˞~ws&v͕ p/{{~vyGe~[V}O.M_y6y9 Y g#w ;fbv )1j);sYC
+1HL[;"E.yF:=}IIII_lL Ǡf˝:u mvǶŻ6u=Wg%l_m m!G.yΑ <{>w<_|5+oNh q-GKG8 a? 䀘og 9 ľ/s#7A>{pob K,|ǁJ88}\9h-7|̶Sm>auSo2/e+xeʴ7 蟑]~iAKfY}o~o}f~?>0BH7]>r'3BL+}um4@>}3:{A_qq?(}w:"5 0fm}f~7 %WTMO^?Jտ] ofʪoUo)>G"veǒ7ّ@a1e#}BO[αKٹ}uf1|k|>衖X/a_|~Yb{a֟Ancy[sWY]pu{Iv,~v {9p.옹 diع8x]k?0fP3TKQdd$EPtL,EQL|b x^j5 Bj~{)?{ݯzٝt,eK#b-(~`~~ [3k 8 p@ ~ ( h {GN[{=W@I?ޱ(facRc WWvW~d*;7VV=֛CE_y=_
^_/{O~2?|+̕;V<K}/.N>>k~>DTe ;}{¾ck^ ]{of.e!¾7;9S LueG|vY̎1ؙU96r=#_|'6 K
+r,y;J
+>S߽k%$&&QBb% Il[.;}na~*Yao>v,|˝O.ᶺ5^7_??XY)-^xBY9oܯ~I7
S~?~́˹ErPg-Ws%4 qWy6 E\`>yb7.}k!s@zTGòWYwM^->U¸We/|mQ]EҴyWy mśSo3VdgG?x(v#' 4*
+Uy ٵn ;X!n˟vxș+z9}[= C1W*py(L
+wtTƦH EͨMѨьf4H݀m0%qI\b;5ӸIn~]3s4
bYY9@L>]LWtw wmGi~2 "ȩ_dUۊOEVyqZZZO$d1Zj=kuc#5obdV'oƶ\ ͰKQZYz7܍>45چ@; wjFgw/zzgo? bh
ĉ8~ Б#! qQ9yN>ӧ(8u4Nҟ1| ǎ C0 c?|)Пs4?s1 <>tvv{?Ǐ9.s]tM =ٳgq}}{P[["dffu.EFF؎]ٙضs;ru5pAtQeGv~vf@9Ue=؋CQFZa13vbFw/fvu`^L;vq CbƞӘvNLi;=(~ooĻ~%>-?ǟ+x/_k－C0X킮 ByEzQ`,@! Ey葛C^} YEXWz,#iystd[!_/N/KE܊-,bG,)-"nVJъTy"EĭNq3Yӣϊo oq }E/_Ͼ^? 牔_- s .qbe%9UDnB_zVlwb9O egEvYyNN$Nsa|$m.ltw(6,JZk7"u[a/DEu=CpX
+Ǐ3C 7p8r$qu$QL96L R 8'Oɓ,s::<߁潧]]Aߞ p70}` 1pCC,b9C <;|8:&s:rDƞÇ߲ }}AGy o{cERػ A?g
!;=hjDU
pբ.W
+[1,E(21jymn݁]miՕ̽ۑ9 ;d#H6V F1 (FLςi {S/VcC.=ƴ1}J i;n8_~x gpӈk o/.'pS8!yO4
+؎P?۱=;Z6co#<ڄu:H)MF$2O%;-֘kK kEQ WjFgc辪uz~bG|M8>/t EbWY> G s
+/߈ė_~&O^<,G裢`
CW|m +>1lkV>Ņh@Uv {ҳ"~jܾy< UzIgDX"Y{2zҬG}xH^!i:|&^ӳ#V%ʪjQ]BncTmG#+hmD;qӋ}={X{b۷ӿ q?d 8t1gݷ~{ڽ tvm]tu=ջݻ*'ջ]{ѽ{?w @ݏ@>ҍ_;jZQYj J|(GYlu0VevW[`ޗldwĮ4lizx 6 [
'z_ڂmݗ0vL$qea/s1WzLU~m'̘s`6,-UxBv9r>0!,&
ۊP
o]u ZmwuzOa~D3sf+v ݀Cke*l[˱c9ַĺHnLXU۱ ;CAl,Pc~ŎˋC/ʣ/@_#cp wյ\n?+ Dh+ p# zO(k-[ Dvc\om8T?<˱#@&9#ݧO 5f}*6gc{V!-(0R\gYʫjQU[:jPrs< 74\n/\ &x|hlnMm w.V8F{wOH̡"]Gzwgw {o^ٻ{U>Sz)PM<;;{;v/Сٍ us7:X=>4
TkCYM+J[
+ l0W`FAM).rEjή ضg RX|9֞Mª`CK$$r)z9>^ϬŴg!
FL[|:_؆/kHz%k^aӛyۉ CҗH ,~6Vi&#]i@ɧV8lBA+;Fll- Z"? X bB,]eHj\ŕhJǂ;1gFW=:7eq'U(.Q*l!)]^>1u@sos-gԞ 1 Ix
+bX,?>~J2<$zb)лVd1t$$#Oл+֦0Ҳ- z3 9+,BYe
*kQYSDZ@UuAM}jݨqQAu /}py}p w3OK [I,ok˧HƎ6ۨhG+ _Ź{77.Rpl{Zh
+M ( ok;|m : tFS@/ ok/i._ݨmBU
@ymJkQRՎ URSe#jW_\ ͅޞӰy Z5'`Ź,8 / 1xyS_Y)$a+K1e{e9fݯ&#w
X^2~ ޅcϑ $e1ҿ\`Gu* ^NH~^yd.V=4+ YH:9 D8,< g1WcA&ܻsŝb:?{|{Xpj @nN17á+c|.9N둗7]]y9'8N<>.(v>_e\5D(S_/,=?3" <(>-vZ!(;DZB^[k=Z;j')- KgІBs1v(.@Iy%J+PZY2EU5RյP^CGyTE .TXU
nTݨxX5m^&xҊ6PftEHf%@1H |KhloEUQv4t(DCKZw܍z_7nxQЍ*W*P^ׅ.t ŕwVKy VPP놮blo)Bjg&6قb履Xzv?8 Ǽ_gg` 3Lzmf6 3~7q{0`"y||sfOļ?&b;XB,/0[1{H
b_oǼb7`WyX\,l$%f 4,Ò`'cc82 M˓0ʝ qϹ;1H<]{07]zJ/Ycr> !橯"9ژO {[ |$z|w=G,or>ʼnmzc6Gk}6.?'{
+\EVeHTS- YGƫވUR1- ikDNF; V',Q*cAtU¡vV*ਬjj%աTWҺzջPrn7j= 76 f4hoifh7>. ~?[X5VPQ܁NTPBuc<ݨrwՍnu5(FIe7=pVKi7e0/\-V6ueb8
+KN,B
y&r*f?=/M'a1)T)Sߛ&RNG;30흙,|kߚo?0IOwW&;0o|sg⧘O1b?y/ { ~v~ 19o~ܓ31ם
±@| ls
1`EQn^ 1v(^Dq`!a{bL,hNW? O/sc ߯~#d?_ PwH?3+roH"P ȬGk Xmn\ :υ35#;s
Χ" F+ NXK~ $&(AQT
+TCI 0T^3*XaFqM
JjkQVWzT\ih@
x||h5jRmjnZ MknBMs3Q܌fT4QjAYS6Q@yc=(wwne5=(EiU/J*z,l7}\ u!"&dԻX3u`վT$
B,d? x様OOO0b{? S>;1;1;1;1]I]11[0`3 A瓿Oo)3fl[C׳ s^sޗf s-b=yWg|̿6Bn~7.iuG4PϩV :U|7{pX~vɿ 5 ȩ}PV]O,XzߺP2y36nD_|El0X( 0 0kbGَɆ|
yFFtF+r嘬1ېKؑkCgs@gw@(F^y䗔 r**`
+5(AE] Qrn4z44yQCm5M>T5P܄&67 M,/mۆ v8ݝ(iB=(Ai
qQRч>큣t/l%{aqɹ 솮YQjl۱3aQp柝 Cc?Ì_߁nÔn䫷boowno/ooHwH}}&u&y&~&z|#LG m-%0W9.0|7ϿV} y]M79v?ΏW;
+7h5fr;o8<2f|o m-Yާ9 gן[sQlDvc 9 o @=;2+E7!ȌEf)"&+
+,Єr7"3π]z2g|vЄE&4a2#l.6vd;,ĉ`(*Tuu oMn=&>
>/|^4yQEy%^7{ao셥s&_Lf~[`N8AIM/JPZه=(-ۋ}pع :8~;"*:[[#@d{v><43 1VL} ----on\=oo} L 0kg &gg^z
'`w~ `'{f^^城tMqϡ1^b/ SrxV~UTe [GUE&K/M?GzC(_c|'Y#P| މeZtλ>ŧ?P
Ohu~= zG߂LlC#(4ZPd,&3
+ f/4"7߀l}[؞myHۥ]z2ؒ'| 5[ Vd@шt ,flYn.
N;t%((uP^
+KE9 U(BeM5jjk᪫ z]n4xnDGc@^ xQkDM(ij֦FahMy!ۄF?
+-04jn8jzڍ=(-ߋҲ~GY:, q6Aap "q ν(Aze;RZU%XңG¡{* #?Gܕ1eVL &=#L >%&wVϿ^yqSx &6L~6Lm-bac識 _d{33_ =ωWӹ,5\3T4EܪjO$\;$ uܲwy=Z}4# ]ݗ?`_WH}3@~^bW%/)}h_{Tw MHޘYCyF(2a0Uh4!}9yd=S\lݑ-۳y[6gacz6ga=i[o 9X+r!Gz=6cSa6
+T-fRFLn7#aEV
Sy) (BMu5jj᭫Gs .73L3Ly.=iMô?M/~,=_nÔ~_/oC y/3~3 3Oމw*&_S.݁)o!(&LzUy[1UӮފ1f_ s _O쫜9_ċ1W{@ swvë|S~' @=?m
/@RϐC3?S< x٧ '5<m&/8ϗe `i[{N);RA tN uOu?q Χ:W jO7mŶ d
+W``f33LLF rw=7 ;tHߙ-]ذ%RvbXiV+ZEڼRvbUjV X+ksV|= PBl0a)VRm2[8RVҊ
+TWU]]z5ލnW#zENjN%T{=(akjy
N ;;4CjCA]=V| JKdUŇPBATڃ E(֣ڂ( A02l+&,<6;MqGnSwl&Ig"e53$s7\O~31՟r̻-ż }A;GI/g_~ow@x,N
+(ZU }PV*ș?ZC;δ3Y1ב3 }`zƶYgѡu̟zcvh of|@>\}s29+Ls8@sB w>ITKKvd_X"&*3d1h@^A!r=#)iXk6lǪu۰"9 ֦cڴ1JJ&#i}:nچ;l{Vdfaen6VbU
yXmS>֚ l.:K!6X( jD݂|RVVW]@ nv5bo>^TLJ^ J p5zPk} z# [[
+߀l؈fPXkPZ8jlQm=
+0J,` E(2DZgv2csgc;1 |b3t5fIԁECq|$ڐxR{ [ 3ޛNuO+|*^\ZHê۰`(w8vNL? c˱\)a
Zrdo!-ώ|ѱ Nx1smIr/^?ʽ&tO>GW#~yMϾbD1yFFbD15~2kߛ:O'D[r#%'\L%zܪ-9Iit+sB넵ybZ}Ht.O,P D:@ybj k _;,a7Tl*J . (R:ȲL|tXViYH\E$,".,4 lJK
:]/7
+KXn{"ϗJrI rB:nC~q&-'BM`/$^V'[CZZ'6M] -۪NɭubJ=_'(ז]ah ɒv.a"0;[zeQrKPbuڰXXXk)[eXSuEà(w 5(܃{XT5
DU|Pr뇞P\zꃐ zC1G яťg>#t<(.>AHtpUŐ_Ģïă_^^ y{__KY3b2~SΧ/0Ij I%izQ'JT'&oUbN :Km(dtOX/*K%(-ubQ,Np"VQRf+ܳf|H\*ERmUd H {%K
T VbQ FXj ' o3O`_EZe |N6uz=bs{XV|'HnC'M ~A4 sm>zo,GRb2sO|'/Ded{X,Ãr; q/t'5b"ږj_Gj9&m^2 |R4NGyϊ08Ŗ+[._l &eQ@|]N|u ˢ2 BÈ/a$}!ލ-¸Gfw k vajƬvr(X2G'4:/8ϯ~\L;.V
J⻡?;0(*=JϠ<E dž{!/>w|(.~,.?<<ҽ>=G"
>ߋ8 :a0pM$ ^WEkbLIϵa gg$
+V {{bۑ2Cž@+˗r> VS;.kyb g>P$ ޞ؞ٟ7*\S<|M*k}8HLPaϵA|8 Hߐ(szZ}sv(+}
Bs`r/s}:7em0 xAܗs/sMXfQZV*.r, !S % @+R@ܜ<_ jkKA( xc{[eY7q?b_Z=bc 4Wr}_+ֵ/:Yڨ6 |\V\̧Lब
vc/$9כGĂ_X $ e%*@ƋK=e/ a.| G8{{{9g Îf;[9c#elXbW_돋eq}< X4ka bq?zAQV}k@T8pm @@?~#q8!(\yS8^0_ļ=~b> XtuB% {} @UI/>쳿ױZ!)>%W: J}%c K=y{;}p=Ò1e5^ J[uTfc jJ fXf?H4u Ks hwOnUz= z'ݖSqۙP'3X2л>2e1b KEW$#\*@s.O,۲;ۛ2Z%pg(6d w}byuqשHo z=vsO,Wy* `@2!3sg0$@s/0
+ J @1%SNgƕ< y@2j ^
+O`/z\+^-y\bBnO
+ӊW ɅcC{|9D2-{|sM^{
+5\kH>!T/(ߜ=9Ћ\`R+^ "5= zdM2gWXA9z˾zyBz>űs~dZ/zg&Z,
+VZj`H2>*k eXd^E+"՞ y ?5OBQâ
+
+׳gO|gvsM^[+*s6Z=?[[O |Y+z8
+R{PI|ezjO< FFWXA9zOP{~E^㚀eH^ae|sıZϒm<'1@"sk 9#ι.P=/Pⴍ.K좤DW ?Ьp /ʾìZ″Ts/@[Nu髽G}.") 9sOu* b 8T 8@y<#ɸ 9^}u#|>!w Hs]2.3XNq,֧8 ϋf?P|b+<̽eG9_$~\_%xHsG̿3j? I=yHBg Ŀá+J x@uOq, eNYQX }
+jnP9O}?z pDG^q9k?/( Wyk 8kg= 9YYTmT X~AD ($ Ԛ!i3a^TK9VpO 4C?H@z&kf߯|bu{%>?4ǣ^ ̾Y/ͧ~{}7h$z}_ wGSާgi O$yp?WwI+3#7X!O>jW2Z?ȼOϚ?4S{}~'o?#?Xf'eo0-C_^QTޠsI
+ |JyFHAj-?9I쓽Ň_}~ ~>'{|j//=\ۇs~hׇ<z^ l@_8z T[z%f?)uaz[1M_@ @=yr>Hp? ?}eWxPx]`W <''_|^NP\ހxWc@w} :rAϧ8] ee }N,3סO=*=~bJ_]
xĀPJbUQu joO2x'OPp?] .wS< ~OޟפOPxW〶OuYK4> :?T{9\;|_:_Us;iFbH_=5FHe=_^NoK=j P 29˶*^5Fh|<WZi>X?%F|?\}p(@(1j9] )]bCOڠ6Dj9]3b~ywO/^/p,XR*{p Z_z}md|L2Hp j9g2}GXw~hLJga~i:xD=au> QCAHp=G^T\ , )F|_9 P_IC*/
+d v~Lwюׅ۫vx`KRWF@^ϵ ;Z^!a[= [Vn}7x`8&9rGeP EOڨ)$:fW
+k^hOr
r'P[/eoG|j<t{%CM\>HK);խ7B+lv_R?HYߧ -Goz )4_Ki7d̾@=@;B0dWe/|0K ;>e-e whW`xԵWWoh G `>¿dv{){W⡗~L8&9!IwM @/B-¶Ih=R(ޟ\'oB^?g{od {#/ο4'y\K @iq`%_\D3 g/
<E3 ~P%KYh= µJ 9rި 4@3uhNyLKb~eO~ `DCqT A icd 9!qea;os!g]2МPqϗno?Y!y :u cwPr Ex !=gd kiwUܳf }OiO ahNGY2Gޗcch} 5#PxE~ $G@~ @3
e K K| ➁O9dwZz
8_>8s;5} !INJgK;,w#>}_ `9<-٦ Ifgs;O>v_GlS}%]?9S`
8@0o|iG3Ae @ Zy7 &VQD>v ߆CN0s}~_#_N0q&>8yNsr>@~ɶGW֧;AtNN0S {oǏj4CzY}2iTZҨF#147IhYhH%j4CzsQFbh4Bo4H F/ϒF5iT_ҨF#147M#j4Cz#9 iTαF5! j4Cz#$j4CRٯTk'g{*ǵP qOv?קGS9z?qԟW돸r\;q qOvS?qY= ? = 돸r\;?珸r\;''GS9ϝ;珸r\; !Tk' qOxG L,<( ~ 3G L,<( ~ 3G L,<( ~ 3G L,<( ~ 3?|oo
~
A77y ߀?|oo
~
A77y ߀~
#7`?265j] Ԝu},#cCPs؏
AZb?265j] Ԝu},#cCPs؏
AZb?265j] Ԝu},#cCPs؏
AZb?265j] Ԝu},#cCPs؏
A~4E ɿh=-{$Z)HGSkُ#ײ MGe?"_~4E ɿh=-{$Z)HGSkُ#ײ MGe?"hhhhhhhhhhhhhhhh0 ~pc '0 ~pc '0 ~pc '0 ~pc Gv O 1<@ ? O 1<@ ? O 1<@ ? O 1<@ x ?Z\PgZ:?Ǐԙ<~u&< -.3A-yhqA j G LPx ?Z\PgZ:?Ǐԙ<~u&< -.3A-yhqA j G LP$&D7~ bIM o@"d?1$&D7~ bIM o@"d?0&؏ oh?`?&؏ oh?`?&؏ oh?`?&؏ oh?`?H7 ~&#$d?xor?MG H7 ~&#$d?xor?MG m/MFExih{4oho7_4m/MFExih{4oho7_47Q [|[|[|[|[|[|[|[|[|[|[|[|[|[|[|[ |;k,@|>k֬fav|<(Vͻ'Z<[gtk.9$z.n]>RuXE]5 Ω&
+SDl7V]opW pn8+Ot\?ݓ:)`J
+tAAAszs=77::m,:uUam_- kvWꮊk{nw
I3j 35\
>'|~?8Qq3|rE|oZ=>Ŀ;Ya;tw}ﺮ݊f`߁xya}{ӹi:^ W?}
+'gY~5 һ>/sZRX3:^_} nL3̖|}uH ݐ
+-ɸW\e
+l: ! !!RuKl˜aܚc?z(-{!3=3pq0\F-l0ܴ0PAt _]~~|*6c =F
9& :>Y>>/xUp5 rivq0coKq;q{ 8:݇>a>Ioo/];;;ǍF#-[˗sM6a;_J/r+~8oé ~@7>gь3g:nwȸɓp0l ~ occ3脇G'`ʤG`ljIPL{ S|Llà e }_A6˝A
+W)*p$WAK&;UpP#XP%F$#<> h* BG?:
+t1;.ZK1 rɱD" 9
+d$)@Pr+m wO._X X*QbV
{mI⸓NwC
+U@^d֧5uCc
+>I 2p%&ԣƞe4\2` ́"8U'wu6J'oTb8Xm^ۆؙ0BGQ(b w_NJ1|mǫ;#E߅řB^='A8q%mK;jY1 Gm8Rytb:Vaq%/ (=E' almų2[z{= XQU UuAk=Գ[
W#{do/ok:
gg#{1wn/,CXX/؋^tvmDO/_r%ޏ;ø~|?p%^:~oppqpoP}ϟٳp;sOéS}O>;~ vtp66w )G0O?"bƟ$S6g:b-ev<ldX- ;sW,D 0c0O 7ydɰ@:R$#( ؤXF8; UX 2:4rtiam~XR,Cb*sdȑcQrD H@𢡄cA?;&s"(.q8ɰ/SNV;)HEO
+j(jLAӒiM5^T.>Ra
+zx;Q[UYh EDTM
z S x== ޣ?c k@ІH턮=%1;6!|0 KW1WṰ މPmdd ·x/]e S7g8cSGT0c
+#.:Ω BuX^ *4BҀK
+̳]`o
{ ?kV<qǏSo{(l &NmLؘ1FɏNbޓ!|0%SP>l /31g Fv 2'\,|
+(!G@!/Kɔ`'W$ M@@t c(%䆠jqLv 뻴2t~/2GtUr'ȡ#N?@f_&Lf>0@Wb8SٹpZ$ؗ&sm1(Wr=uJV*T5kQcSϵj
+;US}J R@
+>ZcRj}rP5 /"b!(Óoi0r¼VNfm͐T L)"uG;|Y Тne,]J/.>Y066'QX2çs1eȣS
MVJT9עpv#Rg-Ac+ ڰо^vp넃[3> nnXۅаn$& #=j{P]݃ntoO5U0<<_|yܙ3rn\P__r41N5[͛vV^ƫWQt2/"|| gI2Oۙ`_`#xFǎO4'!ǡEB;Oc9XrA?[KoH;X6
MP%/Fw(ܷyScgn$+ʜwo[<y~1l ]q/J:Ar)9e{}+g_ EP&%S_
+e^jJ3nu b@6=a1c1:
+^zA_CK%tuș݄dplܡv]m.+;,GdNDFuCFNNJJzPaA]eq^x啗ɡC8y8שy;O) H7n70t^eKyſ
deF|*>{ه@5v?l[?l ?E(tP?,5\B
+`*
Oǀr6nP FW`L։2cs+1Ǩ(}nZ4TA\YMHpZ6w`}'\y{m s'=<: Wt":)zUU{҃vBW/?e ^݅>xN/=LxYeX(5d̒@=\mFeO(KJ^. M?B_}Ql )q2$De$m WbS""_dߞ\ש`Ss8;'%/UaM;TxKף 5ʵi-QXDt0;ڠ1x%6d:8?Crb #4ߚ2)o #s7bއ?{V ta;; ,{H,?lIhtgQ?V%)k7Nn7nP,è c e^-̩48p(sCƬF;-Ec:t˾ .p끽],t[11XڃS_SӃ ]=1]O¥q
i=۟?pZ\AŋH9 Yx9ӧH3'aGy9 CyW2
=?~r_YoD9'"߉{gs (#ߜk zgfC%Mkg?!yp*J{]yGWAMJ wCF5ܟ?|
+צ~s8F 6ؘZ?)^3\?C/pp|g/a{]nL 4a$ A tѦ^e_5 ױ[o0MucY mP2c*τުעɥZd& ر`RW(x_Nhk3ӈnܟvR]`{OpI\o߲Gŏt5߸פ2z]UG1u`dA3ՙ71 )ͮ(wE$ZV:ˡ?~w4kn2e7jjb+/Cqq?kY w~+?C)ulz/E#9Ξ Ϝyoo>c? =zc@g &:q< Gdz
+n5 }|o_/%2e'A)D< ryqp'a6
Ex\N EIv0*tG~(I!G%â#,D !TE==9qp.H$8ipЪ`OXKFTYuJXD
+[UxSj|)KK{X:
KP2zs^.Ly[<⿴\|64 ѠY9k0^qN0> Ao{9p "GwNT^C^[Hy! `a^Z:c@0b5#OJ{K]r^ >GXz M. o~=VYܟ tXZ k
r<Z sjc' 1ۡ玳?<<:!w!*jurs{PVփJ#hm5??ŀUWahd/| o~{GٳD[~9S 8z&~ #We.^D8bϝ㻿y4;sNVb ?m#t ݻ2>a:? d;>rh|]3jL Zj k)E
+7
+H#Z ycI3 E25- cĤd,
+Eaf0ty- R[T\J3dM!5QX9b"#8|@;.sL{V,\\Yep,WYzI:%XD- P7hУ~:+VvXY"mK"a%pUowh罱 Q}-iB07! :cN)
+ PvD](J})Y>?g=4!|hgH bqO,ڵѧRo?`mX~džAl ^M
+#}[1L?:8'S_C[% 5(pGsg/E68uӱ .?ݽ~.DDtCAvvJioD}-K03_j ;[o?¡O?ű'qE\~_{k n75,|.`| g",ߙ+G H?|GI8yOy*ܟF˜ .s*?'P-bB列!D ?yH5 u+$',шK"uCP 4 `S'd(˔!o ir$%GD !!t4 X}t'P@̋
wr8,gf V w]F5W?r3;j9uxǀ;;*൹ a˗"^̵Unx;b @ ŀ;c
ێ1/9i4@f;} ;5!|HͧPk@(5'P[~
+-ڳ֞r%_A5YП6^ĺYe(%G;@`K `+uhsD[
\ڄxunlvguT8pgwso7{ԃL#
+iEsS/ڨeD_+WĦvk =x 9g+~k>$u {nsahpe!YD>
ӧ1)E1/;j#G 6x~ ?Mϔ6 (D)кMCttx?ÿпy peN蔹N>r deH B ^K Wy"fɓh$]1?4Q1JE!(.75h*V n&P/&KTҕr䈏#*B0@ n}X `O
+wJfD+' p-J1v p^dZ%hRe
++ZUԮs j>KM}Yek2Q!P"l[1(| O wS pS_P V-ŵFs``:lK܈]ћN>
+1=` φ>5/5>x ʜ݈(x b 5俛f?|59 eg.eGQ9(? )(vJh3@4@or/hZ@<0䑘',.t< $xCH$%#] `e2:.A-CA j9ԉr$* @x!!rJ17@߰ , Ob#0/=
+sb <.5 S J%kȪWQ%TUv5oWs=,\nTclyVDӺ mGP!bNJ῭swaN
fZojn=H+6\KَnTꖡm*Ǡj=
`W&@ T0mϡ?t$j(Ji .=1c H?Psae 02K?CQ0 E}qhNSs<_s_x sbuX
+VnŚX}X/¥<CSwRCN
+{Tܣ
HqoFRA; .8gRj?$F"?e}0MF,]b, _ro܈gv7 Ϗȉ8}.^7nY ?s>q;\Ƌ=~ gi<'|| ǜ'r,?N 0x`?M' O I8NA4hܦsy]|1ώ?* A H/@<p,Eb,~q-KLǝL0<& X EvJ0
+Q\.VX2˹:r)I
+$)@Dr@2\>H
oL0&a*>iQ
XɏGa\)$`_ z%J(^Bq
+j,QcYY`vH1ST7)[U+3tmt+߶2x>KLU'b;ZS߭3 bM3ڐ
mE W'g
S1 Mx7x sG
+ma۰.zvN ei#;-$Fd{(z K>ZN{݁q: 9H,=X\)ʎ$4[~+~5E'J.+*t VZyaÂflW!: l>n|] hγ
HlFRD"ȭ
~.7 Npv삣}7{ͭ $Ĉ^-E^n J
uh6ǀ6 m;^ Ww; Ç?/gpy\toW_}oK1xΞCө3(?q
+9O@y GcXx '<GBEE+**xVYii)KOOgmmm^ѽe 2YoOm̂DE7|?),|l䄅-go2B6uj(2% Qä<=A~ : r/^n_~nϙ[l[L vp'Hȡ/` ,;+Y"dQQe6/+gijLPL eaA,#1GlfCccl``=slg]m۷-[0{n~z6e ۱m fnXY VYMU[faY٬Uh4-fڊ
+YCm
_tU}`/uz> guYt kw@.sf),DXJ YwK! r<''%%%8sU62Rߓx
{ӗK6SlXm(D36Ktн7'y.`AA졇&q>yO?7,2_tmspP1z{L>_z_R K_WĀ TVpVQWɴ_\2ҕ,>)-.cw +3hXuC
h33; 㢙_h( ȟ>]z6V[[jXCM
bMulIC`M55hzW.g }}+L_UʛYys3)+775tV̴4R~|-VfгRur F-X;-ݣgR!n>, 3lɺC ׅ^iv
+|c) <RNyrE<\Odff{k `<&x̶ vW3M} x'~&Nf=d3pg?y-cwx./=G?ӳt={%;K$,b,(4)$$Z0O /f?ˁED-KNR9?o[ l=?]Xğ۲W`] "P[:Yw{b
TYɖ6YME[58*0YgfZ˖YvVb6ofkmj*+%a)H{9m;9x3Isw^ {RM@ӕ6>0_%~9 uݧzn 4iW6 g(>},O){ꩅag'6yr(KL\][6yMc&z <|
Svܷ߱_ϝ ӏq5UM,*.,/7尸h5׃)%(^P P)cy= Qpuk2-#w}| "#BYNv:dYl?[6nj~dfhh`MMJc55ꂺZ~fRVjkj\TJ%EkKKYNn FYFf&3TWir_ JE[>5Kłn .i&`]P@K$RO ?f%='o0K N\8ؤI v2z3{q 3? yrZZrz{edrc#YrE%E|xPa(aU& x{6m K'4U5& * C##WU
+ֱt)dM}DBOޣg@JQ/T+o)ֳzvN?T}\յ{}eZn端jU5Tżob* *zVӱ*x1{7XuLR^ZZ*hg#ì}N4w5,=3edd͛ ][x](=ֳy۹__u lg;98..)wK&wq̏?(H__?=-khGs@RW)y?@yf lʌqq}-RK,3cwvR- ̜x_{]C=ձFVt jnf lY[WQPUcFrr2k,Cd,Efo|ƿl[g4LnȖo dz
+GysoK%RysOzGK>
kkkkNx\ݟ# u5A}Ab z & 6κb] >or]B?46sf8g?sof=~gx-a7:,N[]\/ #
+YQamT/JW9|`i<< 469:rSX^ie' nv's#_)77 i'PYjXeUeʘ
+32qcu53?
YRn.`&sҼ /#Xe|gۉpTP9K@5$( <:R ?w/ (ǓT˼MW?]mr7cOsmvr~?K k1~g{T9?g3,|/(Seز zORl~z"f1a _6+ݧo3 =S|@ ,妙 h}}TW @WTjh XWږ,a== T'4Գd:-[E|m
SB
le]mm ={Rj~y4T#K( 륺=~i/( N1R/nfE^g_}?bn3gAg-l 65d
+0{
`PoiG3}@.oĉ}i/AS^ ggw?w إDSOy?H{(SM@~ms KJI} )ϕ-d^^ޗ\Sl++yΧ+ױ ]U% | 9bbb؆֠׳l6[Ƕn6mg+
lhx
uIK dzyrr@B s;'ip3x7%rr{R,xj )H<'tz63 >&ȼ3}6ۙMr6٦T3X6զg??r~?1{A?;r- hHSo0{v {X6esvVxCٜ9e?I; =$/|/iҲә2Uk:C1uEL(.ЌrVo*YҢTƔ5uu\x ۷ގf(*bzU
| by*ӜDžڊ
+~5׳]]lٺ~hb,({E>'qa Xӿm}'*TK_ P/=?Ag(ߓ4|:A<yFZfu ڀo[j^Ss(H?c D} wgkc}ؓ )f'<,0%sϥ`Bj~T74wy:Ѝ_siYXT8+.6U{ PM@|~:iu)T''ųxS^|jUw]' {eδ4߫al 9^S: z~f~v6{YV,?}Vz:۸qhf@5c}[34 |ΟjXg46{{fO_Nr?a(3{/}B:$)+62R6[٣6-y\اxw'G1@:K~t'274y{wz߭{C~|mcxOSO; й i3Ƀ-4 T/::3 686JJx5׳:~G[gh+X̢ltE*_X}m UV+V0z-c5e%giHߺYw y ϥ{A_xX|Ou.4K&xN;cü' d66M6Ƽ\ɼyϿ,ǀ?kڒㇸR ԩj6a y^w{e \/
L/5>) й : 3E8A |ڒr_34kaiL
+YNQ1Y3w[*U67J)?]I P< +t:önʚ++*9 +kj
+eggPWNJrsYsS#+.-e)))%Xy^錿)bk8'@17r_] R @
+ z>$$g|ߓ' y 1{=(owx_`=gv4 ߬YKK 3=,#Xttkd߶ww{Ͽ; =w#A ] A{>֧sX*hO=}R/?W&cA,:1u\ΌkxotG
mT -;>uwtSOg;@KYGCS+P]ͿC,DGQ7Xue%ؼ~={vVVö
YC ]X# a).H{X<}LNsyOOyKUO^~QzK{ R@P\)x^~MnextInt(3)-1; i++)
+ {
+ int x = xo + random->nextInt(16) + 8;
+ int z = zo + random->nextInt(16) + 8;
+ islandFeature->place(level, random, x, (level->getTopSolidBlock(x, z)), (z));
+
+ }
+ PIXEndNamedEvent();
+
PIXBeginNamedEvent(0,"Decorate sand/clay/gravel");
for (int i = 0; i < sandCount; i++)
{
@@ -130,19 +147,38 @@ void BiomeDecorator::decorate()
hugeMushroomFeature->place(level, random, x, level->getHeightmap(x, z), z);
}
- for (int i = 0; i < flowerCount; i++)
+ for (int i = 0; i < flowerCount*2; i++)
{
- int x = xo + random->nextInt(16) + 8;
- int y = random->nextInt(Level::genDepth);
- int z = zo + random->nextInt(16) + 8;
- yellowFlowerFeature->place(level, random, x, y, z);
+ if (random->nextInt(1) == 0)
+ {
+ int x = xo + random->nextInt(16) + 8;
+ int y = random->nextInt(Level::genDepth);
+ int z = zo + random->nextInt(16) + 8;
+ yellowFlowerFeature->place(level, random, x, y, z);
+ }
+
+ if (random->nextInt(2) == 0)
+ {
+ int x = xo + random->nextInt(16) + 8;
+ int y = random->nextInt(Level::genDepth);
+ int z = zo + random->nextInt(16) + 8;
+ peonyFlowerFeature->place(level, random, x, y, z);
+ }
+
+ if (random->nextInt(3) == 0)
+ {
+ int x = xo + random->nextInt(16) + 8;
+ int y = random->nextInt(Level::genDepth);
+ int z = zo + random->nextInt(16) + 8;
+ roseFlowerFeature->place(level, random, x, y, z);
+ }
if (random->nextInt(4) == 0)
{
- x = xo + random->nextInt(16) + 8;
- y = random->nextInt(Level::genDepth);
- z = zo + random->nextInt(16) + 8;
- roseFlowerFeature->place(level, random, x, y, z);
+ int x = xo + random->nextInt(16) + 8;
+ int y = random->nextInt(Level::genDepth);
+ int z = zo + random->nextInt(16) + 8;
+ blueroseFlowerFeature->place(level, random, x, y, z);
}
}
@@ -324,5 +360,9 @@ void BiomeDecorator::decorateOres()
decorateDepthSpan(8, redStoneOreFeature, 0, Level::genDepth / 8);
decorateDepthSpan(1, diamondOreFeature, 0, Level::genDepth / 8);
decorateDepthAverage(1, lapisOreFeature, Level::genDepth / 8, Level::genDepth / 8);
+ decorateDepthSpan(3, emeraldOreFeature, 64, Level::genDepth *8);
+
+ decorateDepthSpan(10, rubyOreFeature, 0, Level::genDepth / 6);
+
level->setInstaTick(false);
}
diff --git a/Minecraft.World/BiomeDecorator.h b/Minecraft.World/BiomeDecorator.h
index 01560045a..2e449cec7 100644
--- a/Minecraft.World/BiomeDecorator.h
+++ b/Minecraft.World/BiomeDecorator.h
@@ -47,6 +47,12 @@ protected:
Feature *reedsFeature;
Feature *cactusFeature;
Feature *waterlilyFeature;
+
+ Feature *rubyOreFeature;
+ Feature *emeraldOreFeature;
+ Feature *blueroseFlowerFeature;
+ Feature *peonyFlowerFeature;
+ Feature *islandFeature;
int waterlilyCount;
int treeCount;
diff --git a/Minecraft.World/Boat.cpp b/Minecraft.World/Boat.cpp
index 60d0c807e..68419be0a 100644
--- a/Minecraft.World/Boat.cpp
+++ b/Minecraft.World/Boat.cpp
@@ -323,13 +323,13 @@ void Boat::tick()
if (!level->isClientSide && !removed)
{
remove();
- for (int i = 0; i < 3; i++)
+ for (int i = 0; i < 5; i++)
{
spawnAtLocation(Tile::wood_Id, 1, 0);
}
for (int i = 0; i < 2; i++)
{
- spawnAtLocation(Item::stick->id, 1, 0);
+ //spawnAtLocation(Item::stick->id, 1, 0);
}
}
}
diff --git a/Minecraft.World/CaveFeature.cpp b/Minecraft.World/CaveFeature.cpp
index edd817882..c84635a48 100644
--- a/Minecraft.World/CaveFeature.cpp
+++ b/Minecraft.World/CaveFeature.cpp
@@ -7,7 +7,7 @@ using namespace std;
bool CaveFeature::place(Level *level, Random *random, int x, int y, int z)
{
float dir = random->nextFloat() * PI;
- double rd = 8;
+ double rd = 8 + random->nextDouble() * 8;
double x0 = x + 8 + Mth::sin(dir) * rd;
double x1 = x + 8 - Mth::sin(dir) * rd;
diff --git a/Minecraft.World/ClothDyeRecipes.cpp b/Minecraft.World/ClothDyeRecipes.cpp
index c0625d2e1..f2fd84438 100644
--- a/Minecraft.World/ClothDyeRecipes.cpp
+++ b/Minecraft.World/ClothDyeRecipes.cpp
@@ -55,6 +55,10 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
+ r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::PINK), //
+ L"tg",
+ Tile::peony,L'D');
+
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::ORANGE), //
L"zzg",
new ItemInstance(Item::dye_powder, 1, DyePowderItem::RED),
@@ -81,6 +85,10 @@ void ClothDyeRecipes::addRecipes(Recipes *r)
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),
new ItemInstance(Item::dye_powder, 1, DyePowderItem::WHITE),L'D');
+ r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), //
+ L"tg",
+ Tile::blueRose,L'D');
+
r->addShapelessRecipy(new ItemInstance(Item::dye_powder, 2, DyePowderItem::LIGHT_BLUE), //
L"zzg",
new ItemInstance(Item::dye_powder, 1, DyePowderItem::BLUE),
diff --git a/Minecraft.World/DyePowderItem.cpp b/Minecraft.World/DyePowderItem.cpp
index 3392da982..61750bfd8 100644
--- a/Minecraft.World/DyePowderItem.cpp
+++ b/Minecraft.World/DyePowderItem.cpp
@@ -285,10 +285,18 @@ bool DyePowderItem::growCrop(shared_ptr itemInstance, Level *level
{
if (Tile::flower->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::flower_Id);
}
- else
+ else if (random->nextInt(3) != 0)
{
if (Tile::rose->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::rose_Id);
}
+ else if (random->nextInt(3) != 0)
+ {
+ if (Tile::peony->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::peony_Id);
+ }
+ else if (random->nextInt(3) != 0)
+ {
+ if (Tile::blueRose->canSurvive(level, xx, yy, zz)) level->setTileAndUpdate(xx, yy, zz, Tile::blueRose_Id);
+ }
}
// 4J - Stops infinite loops.
diff --git a/Minecraft.World/FoodRecipies.cpp b/Minecraft.World/FoodRecipies.cpp
index e78700f46..4b9703776 100644
--- a/Minecraft.World/FoodRecipies.cpp
+++ b/Minecraft.World/FoodRecipies.cpp
@@ -17,6 +17,14 @@ void FoodRecipies::addRecipes(Recipes *r)
L'#', Item::goldIngot, L'X', Item::apple,
L'F');
+ //r->addShapedRecipy(new ItemInstance(Item::apple_ruby, 1, 0), //
+ //L"ssscicig",
+ //L"###", //
+ //L"#X#", //
+ //L"###", //
+ //L'#', Item::ruby, L'X', Item::apple,
+ //L'F');
+
r->addShapedRecipy(new ItemInstance(Item::apple_gold, 1, 1), //
L"sssctcig",
L"###", //
diff --git a/Minecraft.World/FurnaceRecipes.cpp b/Minecraft.World/FurnaceRecipes.cpp
index f0a4c770e..febb2461b 100644
--- a/Minecraft.World/FurnaceRecipes.cpp
+++ b/Minecraft.World/FurnaceRecipes.cpp
@@ -19,10 +19,12 @@ FurnaceRecipes::FurnaceRecipes()
{
addFurnaceRecipy(Tile::ironOre_Id, new ItemInstance(Item::ironIngot), .7f);
addFurnaceRecipy(Tile::goldOre_Id, new ItemInstance(Item::goldIngot), 1);
+ addFurnaceRecipy(Tile::netherGold_Id, new ItemInstance(Item::goldIngot), 1);
addFurnaceRecipy(Tile::diamondOre_Id, new ItemInstance(Item::diamond), 1);
addFurnaceRecipy(Tile::sand_Id, new ItemInstance(Tile::glass), .1f);
addFurnaceRecipy(Item::porkChop_raw_Id, new ItemInstance(Item::porkChop_cooked), .35f);
addFurnaceRecipy(Item::beef_raw_Id, new ItemInstance(Item::beef_cooked), .35f);
+ //addFurnaceRecipy(Item::mutton_raw_Id, new ItemInstance(Item::mutton_cooked), .35f);
addFurnaceRecipy(Item::chicken_raw_Id, new ItemInstance(Item::chicken_cooked), .35f);
addFurnaceRecipy(Item::fish_raw_Id, new ItemInstance(Item::fish_cooked), .35f);
addFurnaceRecipy(Tile::cobblestone_Id, new ItemInstance(Tile::stone), .1f);
diff --git a/Minecraft.World/HellRandomLevelSource.cpp b/Minecraft.World/HellRandomLevelSource.cpp
index 26127dde8..87eed33cf 100644
--- a/Minecraft.World/HellRandomLevelSource.cpp
+++ b/Minecraft.World/HellRandomLevelSource.cpp
@@ -496,6 +496,16 @@ void HellRandomLevelSource::postProcess(ChunkSource *parent, int xt, int zt)
quartzFeature.place(level, pprandom, x, y, z);
}
+ OreFeature netherGoldFeature(Tile::netherGold_Id, 13, Tile::netherRack_Id);
+ for (int i = 0; i < 16; i++)
+ {
+ int x = xo + pprandom->nextInt(16);
+ int y = pprandom->nextInt(Level::genDepth - 20) + 10;
+ int z = zo + pprandom->nextInt(16);
+ netherGoldFeature.place(level, pprandom, x, y, z);
+ }
+
+
for (int i = 0; i < 16; i++)
{
int x = xo + random->nextInt(16);
diff --git a/Minecraft.World/IslandFeature.cpp b/Minecraft.World/IslandFeature.cpp
new file mode 100644
index 000000000..99229a9f7
--- /dev/null
+++ b/Minecraft.World/IslandFeature.cpp
@@ -0,0 +1,178 @@
+#include "stdafx.h"
+#include "IslandFeature.h"
+#include "net.minecraft.world.level.h"
+#include "net.minecraft.world.level.tile.h"
+#include "net.minecraft.world.level.biome.h"
+
+IslandFeature::IslandFeature(int tile)
+{
+ this->tile = tile;
+}
+
+bool IslandFeature::place(Level *level, Random *random, int x, int y, int z)
+{
+ x -= 8;
+ z -= 8;
+ while (y > 5 && level->isEmptyTile(x, y, z))
+ y--;
+ if (y <= 4)
+ {
+ return false;
+ }
+
+ y -= 4;
+
+ bool grid[16*16*8] = {0};
+
+ LevelGenerationOptions *levelGenOptions = nullptr;
+ if( app.getLevelGenerationOptions() != nullptr )
+ {
+ levelGenOptions = app.getLevelGenerationOptions();
+
+ int minX = x;
+ int minY = y;
+ int minZ = z;
+
+ int maxX = x + 16;
+ int maxY = y + 8;
+ int maxZ = z + 16;
+
+ bool intersects = levelGenOptions->checkIntersects(minX, minY, minZ, maxX, maxY, maxZ);
+ if(intersects)
+ {
+ //app.DebugPrintf("Skipping reeds feature generation as it overlaps a game rule structure\n");
+ return false;
+ }
+ }
+
+ int spots = random->nextInt(4) + 4;
+ for (int i = 0; i < spots; i++)
+ {
+ double xr = random->nextDouble() * 6 + 3;
+ double yr = random->nextDouble() * 4 + 2;
+ double zr = random->nextDouble() * 6 + 3;
+
+ double xp = random->nextDouble() * (16 - xr - 2) + 1 + xr / 2;
+ double yp = random->nextDouble() * (8 - yr - 4) + 2 + yr / 2;
+ double zp = random->nextDouble() * (16 - zr - 2) + 1 + zr / 2;
+
+ for (int xx = 1; xx < 15; xx++)
+ {
+ for (int zz = 1; zz < 15; zz++)
+ {
+ for (int yy = 1; yy < 7; yy++)
+ {
+ double xd = ((xx - xp) / (xr / 2));
+ double yd = ((yy - yp) / (yr / 2));
+ double zd = ((zz - zp) / (zr / 2));
+ double d = xd * xd + yd * yd + zd * zd;
+ if (d < 1) grid[((xx) * 16 + (zz)) * 8 + (yy)] = true;
+ }
+ }
+ }
+ }
+
+ for (int xx = 0; xx < 16; xx++)
+ {
+ for (int zz = 0; zz < 16; zz++)
+ {
+ for (int yy = 0; yy < 8; yy++)
+ {
+ bool check = !grid[((xx) * 16 + (zz)) * 8 + (yy)] && ((xx < 15 && grid[((xx + 1) * 16 + (zz)) * 8 + (yy)])//
+ || (xx > 0 && grid[((xx - 1) * 16 + (zz)) * 8 + (yy)])
+ || (zz < 15 && grid[((xx) * 16 + (zz + 1)) * 8 + (yy)])
+ || (zz > 0 && grid[((xx) * 16 + (zz - 1)) * 8 + (yy)])
+ || (yy < 7 && grid[((xx) * 16 + (zz)) * 8 + (yy + 1)])
+ || (yy > 0 && grid[((xx) * 16 + (zz)) * 8 + (yy - 1)]));
+
+ if (check)
+ {
+ Material *m = level->getMaterial(x + xx, y + yy, z + zz);
+ if (yy >= 4 && m->isLiquid()) return false;
+ if (yy < 4 && (!m->isSolid() && level->getTile(x + xx, y + yy, z + zz) != tile)) return false;
+
+ }
+ }
+ }
+ }
+
+ int height = random->nextInt(32);
+
+ for (int xx = 0; xx < 16; xx++)
+ {
+ for (int zz = 0; zz < 16; zz++)
+ {
+ for (int yy = 0; yy < 8; yy++)
+ {
+ if (grid[((xx) * 8 + (zz)) * 8 + (yy)])
+ {
+ level->setTileAndData(x + xx, y + yy+100+height, z + zz, tile, 0, Tile::UPDATE_CLIENTS);
+ level->setTileAndData(x + xx, y + yy+98+height, z + zz, Tile::dirt_Id, 0, Tile::UPDATE_CLIENTS);
+ level->setTileAndData(x + xx, y + yy+96+height, z + zz, Tile::stone_Id, 0, Tile::UPDATE_CLIENTS);
+ }
+ }
+ }
+ }
+
+ for (int xx = 0; xx < 16; xx++)
+ {
+ for (int zz = 0; zz < 16; zz++)
+ {
+ for (int yy = 4; yy < 8; yy++)
+ {
+ if (grid[((xx) * 16 + (zz)) * 8 + (yy)])
+ {
+ if (level->getTile(x + xx, y + yy - 1, z + zz) == Tile::dirt_Id && level->getBrightness(LightLayer::Sky, x + xx, y + yy, z + zz) > 0)
+ {
+ Biome *b = level->getBiome(x + xx, z + zz);
+ if (b->topMaterial == Tile::mycel_Id) level->setTileAndData(x + xx, y + yy - 1, z + zz, Tile::mycel_Id, 0, Tile::UPDATE_CLIENTS);
+ else level->setTileAndData(x + xx, y + yy - 1, z + zz, Tile::grass_Id, 0, Tile::UPDATE_CLIENTS);
+ }
+ }
+ }
+ }
+ }
+
+ if (Tile::tiles[tile]->material == Material::lava)
+ {
+ for (int xx = 0; xx < 16; xx++)
+ {
+ for (int zz = 0; zz < 16; zz++)
+ {
+ for (int yy = 0; yy < 8; yy++)
+ {
+ bool check = !grid[((xx) * 16 + (zz)) * 8 + (yy)] && (
+ (xx < 15 && grid[(((xx + 1) * 16 + (zz)) * 8 + (yy))])
+ || (xx > 0 && grid[(((xx - 1) * 16 + (zz)) * 8 + (yy))])
+ || (zz < 15 && grid[(((xx) * 16 + (zz + 1)) * 8 + (yy))])
+ || (zz > 0 && grid[(((xx) * 16 + (zz - 1)) * 8 + (yy))])
+ || (yy < 7 && grid[(((xx) * 16 + (zz)) * 8 + (yy + 1))])
+ || (yy > 0 && grid[(((xx) * 16 + (zz)) * 8 + (yy - 1))]));
+
+ if (check)
+ {
+ if ((yy<4 || random->nextInt(2)!=0) && level->getMaterial(x + xx, y + yy, z + zz)->isSolid())
+ {
+ level->setTileAndData(x + xx, y + yy, z + zz, Tile::stone_Id, 0, Tile::UPDATE_CLIENTS);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ // 4J - brought forward from 1.8.2
+ if (Tile::tiles[tile]->material == Material::water)
+ {
+ for (int xx = 0; xx < 16; xx++)
+ {
+ for (int zz = 0; zz < 16; zz++)
+ {
+ int yy = 4;
+ if (level->shouldFreezeIgnoreNeighbors(x + xx, y + yy, z + zz)) level->setTileAndData(x + xx, y + yy, z + zz, Tile::ice_Id, 0, Tile::UPDATE_CLIENTS);
+ }
+ }
+ }
+
+ return true;
+}
\ No newline at end of file
diff --git a/Minecraft.World/IslandFeature.h b/Minecraft.World/IslandFeature.h
new file mode 100644
index 000000000..835f8fac3
--- /dev/null
+++ b/Minecraft.World/IslandFeature.h
@@ -0,0 +1,14 @@
+#pragma once
+#include "Feature.h"
+#include "Material.h"
+
+class IslandFeature : public Feature
+{
+private:
+ int tile;
+
+public:
+ IslandFeature (int tile);
+
+ virtual bool place(Level *level, Random *random, int x, int y, int z);
+};
\ No newline at end of file
diff --git a/Minecraft.World/Item.cpp b/Minecraft.World/Item.cpp
index ffb310704..52f9f0940 100644
--- a/Minecraft.World/Item.cpp
+++ b/Minecraft.World/Item.cpp
@@ -16,6 +16,7 @@
#include "HangingEntityItem.h"
#include "HtmlString.h"
+
typedef Item::Tier _Tier;
//const UUID Item::BASE_ATTACK_DAMAGE_UUID = UUID::fromString(L"CB3F55D3-645C-4F38-A497-9C13A33DB5CF");
@@ -25,6 +26,7 @@ wstring Item::ICON_DESCRIPTION_PREFIX = L"item.";
const _Tier *_Tier::WOOD = new _Tier(0, 59, 2, 0, 15); //
const _Tier *_Tier::STONE = new _Tier(1, 131, 4, 1, 5); //
const _Tier *_Tier::IRON = new _Tier(2, 250, 6, 2, 14); //
+const _Tier *_Tier::RUBY = new _Tier(3, 67, 15, 3, 27); //
const _Tier *_Tier::DIAMOND = new _Tier(3, 1561, 8, 3, 10); //
const _Tier *_Tier::GOLD = new _Tier(0, 32, 12, 0, 22);
@@ -60,6 +62,13 @@ Item *Item::shovel_diamond = nullptr;
Item *Item::pickAxe_diamond = nullptr;
Item *Item::hatchet_diamond = nullptr;
+//Item *Item::sword_ruby = nullptr;
+//Item *Item::shovel_ruby = nullptr;
+//Item *Item::pickAxe_ruby = nullptr;
+//Item *Item::hatchet_ruby = nullptr;
+//Item *Item::hoe_ruby = nullptr;
+//Item *Item::ruby = nullptr;
+
Item *Item::stick = nullptr;
Item *Item::bowl = nullptr;
Item *Item::mushroomStew = nullptr;
@@ -259,30 +268,35 @@ void Item::staticCtor()
Item::sword_iron = ( new WeaponItem(11, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_iron) ->setIconName(L"swordIron")->setDescriptionId(IDS_ITEM_SWORD_IRON)->setUseDescriptionId(IDS_DESC_SWORD);
Item::sword_diamond = ( new WeaponItem(20, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_diamond) ->setIconName(L"swordDiamond")->setDescriptionId(IDS_ITEM_SWORD_DIAMOND)->setUseDescriptionId(IDS_DESC_SWORD);
Item::sword_gold = ( new WeaponItem(27, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_gold) ->setIconName(L"swordGold")->setDescriptionId(IDS_ITEM_SWORD_GOLD)->setUseDescriptionId(IDS_DESC_SWORD);
+
Item::shovel_wood = ( new ShovelItem(13, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_wood) ->setIconName(L"shovelWood")->setDescriptionId(IDS_ITEM_SHOVEL_WOOD)->setUseDescriptionId(IDS_DESC_SHOVEL);
Item::shovel_stone = ( new ShovelItem(17, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_stone) ->setIconName(L"shovelStone")->setDescriptionId(IDS_ITEM_SHOVEL_STONE)->setUseDescriptionId(IDS_DESC_SHOVEL);
Item::shovel_iron = ( new ShovelItem(0, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_iron) ->setIconName(L"shovelIron")->setDescriptionId(IDS_ITEM_SHOVEL_IRON)->setUseDescriptionId(IDS_DESC_SHOVEL);
Item::shovel_diamond = ( new ShovelItem(21, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_diamond) ->setIconName(L"shovelDiamond")->setDescriptionId(IDS_ITEM_SHOVEL_DIAMOND)->setUseDescriptionId(IDS_DESC_SHOVEL);
Item::shovel_gold = ( new ShovelItem(28, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_gold) ->setIconName(L"shovelGold")->setDescriptionId(IDS_ITEM_SHOVEL_GOLD)->setUseDescriptionId(IDS_DESC_SHOVEL);
+
Item::pickAxe_wood = ( new PickaxeItem(14, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_wood) ->setIconName(L"pickaxeWood")->setDescriptionId(IDS_ITEM_PICKAXE_WOOD)->setUseDescriptionId(IDS_DESC_PICKAXE);
Item::pickAxe_stone = ( new PickaxeItem(18, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_stone) ->setIconName(L"pickaxeStone")->setDescriptionId(IDS_ITEM_PICKAXE_STONE)->setUseDescriptionId(IDS_DESC_PICKAXE);
Item::pickAxe_iron = ( new PickaxeItem(1, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_iron) ->setIconName(L"pickaxeIron")->setDescriptionId(IDS_ITEM_PICKAXE_IRON)->setUseDescriptionId(IDS_DESC_PICKAXE);
Item::pickAxe_diamond = ( new PickaxeItem(22, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_diamond) ->setIconName(L"pickaxeDiamond")->setDescriptionId(IDS_ITEM_PICKAXE_DIAMOND)->setUseDescriptionId(IDS_DESC_PICKAXE);
Item::pickAxe_gold = ( new PickaxeItem(29, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_gold) ->setIconName(L"pickaxeGold")->setDescriptionId(IDS_ITEM_PICKAXE_GOLD)->setUseDescriptionId(IDS_DESC_PICKAXE);
+
Item::hatchet_wood = ( new HatchetItem(15, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_wood) ->setIconName(L"hatchetWood")->setDescriptionId(IDS_ITEM_HATCHET_WOOD)->setUseDescriptionId(IDS_DESC_HATCHET);
Item::hatchet_stone = ( new HatchetItem(19, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_stone) ->setIconName(L"hatchetStone")->setDescriptionId(IDS_ITEM_HATCHET_STONE)->setUseDescriptionId(IDS_DESC_HATCHET);
Item::hatchet_iron = ( new HatchetItem(2, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_iron) ->setIconName(L"hatchetIron")->setDescriptionId(IDS_ITEM_HATCHET_IRON)->setUseDescriptionId(IDS_DESC_HATCHET);
Item::hatchet_diamond = ( new HatchetItem(23, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_diamond) ->setIconName(L"hatchetDiamond")->setDescriptionId(IDS_ITEM_HATCHET_DIAMOND)->setUseDescriptionId(IDS_DESC_HATCHET);
Item::hatchet_gold = ( new HatchetItem(30, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_gold) ->setIconName(L"hatchetGold")->setDescriptionId(IDS_ITEM_HATCHET_GOLD)->setUseDescriptionId(IDS_DESC_HATCHET);
+
Item::hoe_wood = ( new HoeItem(34, _Tier::WOOD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_wood) ->setIconName(L"hoeWood")->setDescriptionId(IDS_ITEM_HOE_WOOD)->setUseDescriptionId(IDS_DESC_HOE);
Item::hoe_stone = ( new HoeItem(35, _Tier::STONE) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_stone) ->setIconName(L"hoeStone")->setDescriptionId(IDS_ITEM_HOE_STONE)->setUseDescriptionId(IDS_DESC_HOE);
Item::hoe_iron = ( new HoeItem(36, _Tier::IRON) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_iron) ->setIconName(L"hoeIron")->setDescriptionId(IDS_ITEM_HOE_IRON)->setUseDescriptionId(IDS_DESC_HOE);
Item::hoe_diamond = ( new HoeItem(37, _Tier::DIAMOND) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_diamond) ->setIconName(L"hoeDiamond")->setDescriptionId(IDS_ITEM_HOE_DIAMOND)->setUseDescriptionId(IDS_DESC_HOE);
Item::hoe_gold = ( new HoeItem(38, _Tier::GOLD) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_gold) ->setIconName(L"hoeGold")->setDescriptionId(IDS_ITEM_HOE_GOLD)->setUseDescriptionId(IDS_DESC_HOE);
+
Item::door_wood = ( new DoorItem(68, Material::wood) ) ->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_wood)->setIconName(L"doorWood")->setDescriptionId(IDS_ITEM_DOOR_WOOD)->setUseDescriptionId(IDS_DESC_DOOR_WOOD);
Item::door_iron = ( new DoorItem(74, Material::metal) ) ->setBaseItemTypeAndMaterial(eBaseItemType_door, eMaterial_iron)->setIconName(L"doorIron")->setDescriptionId(IDS_ITEM_DOOR_IRON)->setUseDescriptionId(IDS_DESC_DOOR_IRON);
@@ -315,7 +329,6 @@ void Item::staticCtor()
Item::ironIngot = ( new Item(9) )->setIconName(L"ingotIron") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_iron)->setDescriptionId(IDS_ITEM_INGOT_IRON)->setUseDescriptionId(IDS_DESC_INGOT);
Item::goldIngot = ( new Item(10) )->setIconName(L"ingotGold") ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_gold)->setDescriptionId(IDS_ITEM_INGOT_GOLD)->setUseDescriptionId(IDS_DESC_INGOT);
-
// 4J-PB - todo - add materials and base types to the ones below
Item::bucket_empty = ( new BucketItem(69, 0) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_water)->setIconName(L"bucket")->setDescriptionId(IDS_ITEM_BUCKET)->setUseDescriptionId(IDS_DESC_BUCKET)->setMaxStackSize(16);
Item::bowl = ( new Item(25) ) ->setBaseItemTypeAndMaterial(eBaseItemType_utensil, eMaterial_wood)->setIconName(L"bowl")->setDescriptionId(IDS_ITEM_BOWL)->setUseDescriptionId(IDS_DESC_BOWL)->setMaxStackSize(64);
@@ -495,6 +508,20 @@ void Item::staticCtor()
Item::lead = (new LeashItem(164)) ->setBaseItemTypeAndMaterial(eBaseItemType_pockettool, eMaterial_undefined)->setIconName(L"lead")->setDescriptionId(IDS_ITEM_LEAD)->setUseDescriptionId(IDS_DESC_LEAD);
Item::nameTag = (new NameTagItem(165)) ->setIconName(L"name_tag")->setDescriptionId(IDS_ITEM_NAME_TAG)->setUseDescriptionId(IDS_DESC_NAME_TAG);}
+ Item *Item::ruby = (new Item(166)) ->setBaseItemTypeAndMaterial(eBaseItemType_treasure, eMaterial_ruby)->setIconName(L"ruby")->setDescriptionId(IDS_ITEM_EMERALD)->setUseDescriptionId(IDS_DESC_EMERALD);
+ Item *Item::sword_ruby = ( new WeaponItem(167, _Tier::RUBY) ) ->setBaseItemTypeAndMaterial(eBaseItemType_sword, eMaterial_ruby) ->setIconName(L"ruby_sword")->setDescriptionId(IDS_ITEM_SWORD_DIAMOND)->setUseDescriptionId(IDS_DESC_SWORD);
+ Item *Item::shovel_ruby = ( new ShovelItem(168, _Tier::RUBY) ) ->setBaseItemTypeAndMaterial(eBaseItemType_shovel, eMaterial_ruby) ->setIconName(L"ruby_shovel")->setDescriptionId(IDS_ITEM_SHOVEL_DIAMOND)->setUseDescriptionId(IDS_DESC_SHOVEL);
+ Item *Item::pickAxe_ruby = ( new PickaxeItem(169, _Tier::RUBY) ) ->setBaseItemTypeAndMaterial(eBaseItemType_pickaxe, eMaterial_ruby) ->setIconName(L"ruby_pickaxe")->setDescriptionId(IDS_ITEM_PICKAXE_DIAMOND)->setUseDescriptionId(IDS_DESC_PICKAXE);
+ Item *Item::hatchet_ruby = ( new HatchetItem(170, _Tier::RUBY) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hatchet, eMaterial_ruby) ->setIconName(L"ruby_axe")->setDescriptionId(IDS_ITEM_HATCHET_DIAMOND)->setUseDescriptionId(IDS_DESC_HATCHET);
+ Item *Item::hoe_ruby = ( new HoeItem(171, _Tier::RUBY) ) ->setBaseItemTypeAndMaterial(eBaseItemType_hoe, eMaterial_ruby) ->setIconName(L"ruby_hoe")->setDescriptionId(IDS_ITEM_HOE_DIAMOND)->setUseDescriptionId(IDS_DESC_HOE);
+ //ArmorItem *Item::helmet_ruby = static_cast((new ArmorItem(172, ArmorItem::ArmorMaterial::RUBY, 3, ArmorItem::SLOT_HEAD))->setBaseItemTypeAndMaterial(eBaseItemType_helmet, eMaterial_ruby)->setIconName(L"ruby_helmet")->setDescriptionId(IDS_ITEM_HELMET_DIAMOND)->setUseDescriptionId(IDS_DESC_HELMET_DIAMOND));
+ //ArmorItem *Item::chestplate_ruby = static_cast((new ArmorItem(173, ArmorItem::ArmorMaterial::RUBY, 3, ArmorItem::SLOT_TORSO))->setBaseItemTypeAndMaterial(eBaseItemType_chestplate, eMaterial_ruby)->setIconName(L"ruby_chestplate")->setDescriptionId(IDS_ITEM_CHESTPLATE_DIAMOND)->setUseDescriptionId(IDS_DESC_CHESTPLATE_DIAMOND));
+ //ArmorItem *Item::leggings_ruby = static_cast((new ArmorItem(174, ArmorItem::ArmorMaterial::RUBY, 3, ArmorItem::SLOT_LEGS))->setBaseItemTypeAndMaterial(eBaseItemType_leggings, eMaterial_ruby)->setIconName(L"ruby_leggings")->setDescriptionId(IDS_ITEM_LEGGINGS_DIAMOND)->setUseDescriptionId(IDS_DESC_LEGGINGS_DIAMOND));
+ //ArmorItem *Item::boots_ruby = static_cast((new ArmorItem(175, ArmorItem::ArmorMaterial::RUBY, 3, ArmorItem::SLOT_FEET))->setBaseItemTypeAndMaterial(eBaseItemType_boots, eMaterial_ruby)->setIconName(L"ruby_boots")->setDescriptionId(IDS_ITEM_BOOTS_DIAMOND)->setUseDescriptionId(IDS_DESC_BOOTS_DIAMOND));
+ //Item *Item::mutton_raw = (new FoodItem(172, 3, FoodConstants::FOOD_SATURATION_LOW, true)) ->setIconName(L"mutton_Raw")->setDescriptionId(IDS_ITEM_BEEF_RAW)->setUseDescriptionId(IDS_DESC_BEEF_RAW);
+ //Item *Item::mutton_cooked = (new FoodItem(173, 6, FoodConstants::FOOD_SATURATION_GOOD, true))->setIconName(L"mutton_Cooked")->setDescriptionId(IDS_ITEM_BEEF_COOKED)->setUseDescriptionId(IDS_DESC_BEEF_COOKED);
+ //Item *Item::apple_ruby = ( new GoldenAppleItem(174, 4, FoodConstants::FOOD_SATURATION_SUPERNATURAL, false) )->setCanAlwaysEat()->setEatEffect(MobEffect::regeneration->id, 5, 1, 1.0f)
+ // ->setBaseItemTypeAndMaterial(eBaseItemType_giltFruit,eMaterial_apple)->setIconName(L"appleRuby")->setDescriptionId(IDS_ITEM_APPLE_GOLD);//->setUseDescriptionId(IDS_DESC_GOLDENAPPLE);
// 4J Stu - We need to do this after the staticCtor AND after staticCtors for other class
// eg Recipes
diff --git a/Minecraft.World/Item.h b/Minecraft.World/Item.h
index 22d0a9d15..4a74f8937 100644
--- a/Minecraft.World/Item.h
+++ b/Minecraft.World/Item.h
@@ -45,6 +45,7 @@ public:
eMaterial_iron,
eMaterial_gold,
eMaterial_diamond,
+ eMaterial_ruby,
eMaterial_cloth,
eMaterial_chain, // 4J Stu - It's available in creative in 1.8
eMaterial_detector,
@@ -158,6 +159,7 @@ public:
static const Tier *IRON; //
static const Tier *DIAMOND; //
static const Tier *GOLD;
+ static const Tier *RUBY;
private:
const int level;
@@ -217,6 +219,22 @@ public:
static Item *pickAxe_diamond;
static Item *hatchet_diamond;
+ static Item *sword_ruby;
+ static Item *shovel_ruby;
+ static Item *pickAxe_ruby;
+ static Item *hatchet_ruby;
+ static Item *hoe_ruby;
+ static Item *ruby;
+
+ static Item *mutton_raw;
+ static Item *mutton_cooked;
+ static Item *apple_ruby;
+
+ static ArmorItem *helmet_ruby;
+ static ArmorItem *chestplate_ruby;
+ static ArmorItem *leggings_ruby;
+ static ArmorItem *boots_ruby;
+
static Item *stick;
static Item *bowl;
static Item *mushroomStew;
@@ -618,6 +636,22 @@ public:
static const int lead_Id = 420;
static const int nameTag_Id = 421;
+ static const int ruby_Id = 422;
+ static const int sword_ruby_Id = 423;
+ static const int shovel_ruby_Id = 424;
+ static const int pickAxe_ruby_Id= 425;
+ static const int hatchet_ruby_Id = 426;
+ static const int hoe_ruby_Id = 427;
+
+ static const int helmet_ruby_Id = 428;
+ static const int chestplate_ruby_Id = 429;
+ static const int leggings_ruby_Id = 430;
+ static const int boots_ruby_Id = 431;
+
+ static const int mutton_cooked_Id = 432;
+ static const int mutton_raw_Id = 433;
+ static const int apple_ruby_Id = 434;
+
public:
const int id;
diff --git a/Minecraft.World/LeafTile.cpp b/Minecraft.World/LeafTile.cpp
index f8f5deae4..6cb9c264d 100644
--- a/Minecraft.World/LeafTile.cpp
+++ b/Minecraft.World/LeafTile.cpp
@@ -11,9 +11,10 @@ const unsigned int LeafTile::LEAF_NAMES[LEAF_NAMES_LENGTH] = { IDS_TILE_LEAVES_O
IDS_TILE_LEAVES_SPRUCE,
IDS_TILE_LEAVES_BIRCH,
IDS_TILE_LEAVES_JUNGLE,
+ IDS_TILE_LEAVES_OAK,
};
-const wstring LeafTile::TEXTURES[2][4] = { {L"leaves", L"leaves_spruce", L"leaves", L"leaves_jungle"}, {L"leaves_opaque", L"leaves_spruce_opaque", L"leaves_opaque", L"leaves_jungle_opaque"},};
+const wstring LeafTile::TEXTURES[2][5] = { {L"leaves", L"leaves_spruce", L"leaves", L"leaves_jungle", L"alpha_leaves"}, {L"leaves_opaque", L"leaves_spruce_opaque", L"leaves_opaque", L"leaves_jungle_opaque", L"alpha_leaves_opaque"},};
LeafTile::LeafTile(int id) : TransparentTile(id, Material::leaves, false, isSolidRender())
{
@@ -48,6 +49,10 @@ int LeafTile::getColor(int data)
{
return FoliageColor::getBirchColor();
}
+ if ((data & LEAF_TYPE_MASK) == ALPHA_LEAF)
+ {
+ return FoliageColor::getDefaultColor();
+ }
return FoliageColor::getDefaultColor();
}
@@ -68,6 +73,10 @@ int LeafTile::getColor(LevelSource *level, int x, int y, int z, int data)
{
return FoliageColor::getBirchColor();
}
+ if ((data & LEAF_TYPE_MASK) == ALPHA_LEAF)
+ {
+ return FoliageColor::getDefaultColor();
+ }
int totalRed = 0;
int totalGreen = 0;
@@ -313,6 +322,11 @@ Icon *LeafTile::getTexture(int face, int data)
{
return icons[fancyTextureSet][BIRCH_LEAF];
}
+ if ((data & LEAF_TYPE_MASK) == ALPHA_LEAF)
+ {
+ return icons[fancyTextureSet][ALPHA_LEAF];
+ }
+
return icons[fancyTextureSet][0];
}
diff --git a/Minecraft.World/LeafTile.h b/Minecraft.World/LeafTile.h
index e6c39a7f3..66b4809d3 100644
--- a/Minecraft.World/LeafTile.h
+++ b/Minecraft.World/LeafTile.h
@@ -9,7 +9,7 @@ class LeafTile : public TransparentTile
friend class Tile;
friend class ChunkRebuildData;
public:
- static const wstring TEXTURES[2][4];
+ static const wstring TEXTURES[2][5];
static const int REQUIRED_WOOD_RANGE = 4;
static const int UPDATE_LEAF_BIT = 8;
@@ -18,8 +18,9 @@ public:
static const int EVERGREEN_LEAF = 1;
static const int BIRCH_LEAF = 2;
static const int JUNGLE_LEAF = 3;
+ static const int ALPHA_LEAF = 4;
- static const int LEAF_NAMES_LENGTH = 4;
+ static const int LEAF_NAMES_LENGTH = 5;
static const unsigned int LEAF_NAMES[LEAF_NAMES_LENGTH];
private:
diff --git a/Minecraft.World/Minecraft.World.vcxproj b/Minecraft.World/Minecraft.World.vcxproj
index b6af91538..38b37a41a 100644
--- a/Minecraft.World/Minecraft.World.vcxproj
+++ b/Minecraft.World/Minecraft.World.vcxproj
@@ -3143,6 +3143,7 @@
+
@@ -4086,6 +4087,7 @@
+
diff --git a/Minecraft.World/Minecraft.World.vcxproj.filters b/Minecraft.World/Minecraft.World.vcxproj.filters
index bf872596b..bb11f35ea 100644
--- a/Minecraft.World/Minecraft.World.vcxproj.filters
+++ b/Minecraft.World/Minecraft.World.vcxproj.filters
@@ -476,6 +476,9 @@
net\minecraft\world\level\levelgen\feature
+
+ net\minecraft\world\level\levelgen\feature
+
net\minecraft\world\level\levelgen\feature
@@ -3346,6 +3349,9 @@
net\minecraft\world\level\levelgen\feature
+
+ net\minecraft\world\level\levelgen\feature
+
net\minecraft\world\level\levelgen\feature
diff --git a/Minecraft.World/MycelTile.cpp b/Minecraft.World/MycelTile.cpp
index 76b742e34..6192a23d0 100644
--- a/Minecraft.World/MycelTile.cpp
+++ b/Minecraft.World/MycelTile.cpp
@@ -32,6 +32,12 @@ void MycelTile::registerIcons(IconRegister *iconRegister)
icon = iconRegister->registerIcon(L"mycel_side");
iconTop = iconRegister->registerIcon(L"mycel_top");
iconSnowSide = iconRegister->registerIcon(L"snow_side");
+
+ if (id == Tile::alphaGrass_Id)
+ {
+ icon = iconRegister->registerIcon(L"alpha_grass_side");
+ iconTop = iconRegister->registerIcon(L"alpha_grass_top");
+ }
}
void MycelTile::tick(Level *level, int x, int y, int z, Random *random)
@@ -64,7 +70,7 @@ void MycelTile::tick(Level *level, int x, int y, int z, Random *random)
void MycelTile::animateTick(Level *level, int x, int y, int z, Random *random)
{
Tile::animateTick(level, x, y, z, random);
- if (random->nextInt(10) == 0) level->addParticle(eParticleType_townaura, x + random->nextFloat(), y + 1.1f, z + random->nextFloat(), 0, 0, 0);
+ if (random->nextInt(10) == 0 && id != Tile::alphaGrass_Id) level->addParticle(eParticleType_townaura, x + random->nextFloat(), y + 1.1f, z + random->nextFloat(), 0, 0, 0);
}
diff --git a/Minecraft.World/OreRecipies.cpp b/Minecraft.World/OreRecipies.cpp
index 387d059b1..dab7acd18 100644
--- a/Minecraft.World/OreRecipies.cpp
+++ b/Minecraft.World/OreRecipies.cpp
@@ -20,17 +20,20 @@ void OreRecipies::_init()
ADD_OBJECT(map[3],Tile::emeraldBlock);
ADD_OBJECT(map[3],new ItemInstance(Item::emerald, 9));
- ADD_OBJECT(map[4],Tile::lapisBlock);
- ADD_OBJECT(map[4],new ItemInstance(Item::dye_powder, 9, DyePowderItem::BLUE));
+ ADD_OBJECT(map[4],Tile::rubyBlock);
+ ADD_OBJECT(map[4],new ItemInstance(Item::ruby, 9));
- ADD_OBJECT(map[5],Tile::redstoneBlock);
- ADD_OBJECT(map[5],new ItemInstance(Item::redStone, 9));
+ ADD_OBJECT(map[5],Tile::lapisBlock);
+ ADD_OBJECT(map[5],new ItemInstance(Item::dye_powder, 9, DyePowderItem::BLUE));
- ADD_OBJECT(map[6],Tile::coalBlock);
- ADD_OBJECT(map[6],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL));
+ ADD_OBJECT(map[6],Tile::redstoneBlock);
+ ADD_OBJECT(map[6],new ItemInstance(Item::redStone, 9));
- ADD_OBJECT(map[7],Tile::hayBlock);
- ADD_OBJECT(map[7],new ItemInstance(Item::wheat, 9));
+ ADD_OBJECT(map[7],Tile::coalBlock);
+ ADD_OBJECT(map[7],new ItemInstance(Item::coal, 9, CoalItem::STONE_COAL));
+
+ ADD_OBJECT(map[8],Tile::hayBlock);
+ ADD_OBJECT(map[8],new ItemInstance(Item::wheat, 9));
}
void OreRecipies::addRecipes(Recipes *r)
{
diff --git a/Minecraft.World/OreRecipies.h b/Minecraft.World/OreRecipies.h
index f2bef1f7d..0c675f3f1 100644
--- a/Minecraft.World/OreRecipies.h
+++ b/Minecraft.World/OreRecipies.h
@@ -1,6 +1,6 @@
#pragma once
-#define MAX_ORE_RECIPES 8
+#define MAX_ORE_RECIPES 9
class OreRecipies
{
diff --git a/Minecraft.World/OreTile.cpp b/Minecraft.World/OreTile.cpp
index bd656541c..7f3899e3e 100644
--- a/Minecraft.World/OreTile.cpp
+++ b/Minecraft.World/OreTile.cpp
@@ -14,6 +14,8 @@ int OreTile::getResource(int data, Random *random, int playerBonusLevel)
if (id == Tile::lapisOre_Id) return Item::dye_powder_Id;
if (id == Tile::emeraldOre_Id) return Item::emerald_Id;
if (id == Tile::netherQuartz_Id) return Item::netherQuartz_Id;
+ if (id == Tile::rubyOre_Id) return Item::ruby_Id;
+
return id;
}
@@ -65,6 +67,10 @@ void OreTile::spawnResources(Level *level, int x, int y, int z, int data, float
{
magicCount = Mth::nextInt(level->random, 2, 5);
}
+ else if (id == Tile::rubyOre_Id)
+ {
+ magicCount = Mth::nextInt(level->random, 2, 8);
+ }
popExperience(level, x, y, z, magicCount);
}
}
diff --git a/Minecraft.World/RandomLevelSource.cpp b/Minecraft.World/RandomLevelSource.cpp
index a0e7a94bb..8fd4a7705 100644
--- a/Minecraft.World/RandomLevelSource.cpp
+++ b/Minecraft.World/RandomLevelSource.cpp
@@ -33,6 +33,7 @@ RandomLevelSource::RandomLevelSource(Level *level, int64_t seed, bool generateSt
level->getLevelData()->getMoatFlags(&m_classicEdgeMoat, &m_smallEdgeMoat, &m_mediumEdgeMoat);
#endif
caveFeature = new LargeCaveFeature();
+ caveLargeFeature = new LargeCaveFeature();
strongholdFeature = new StrongholdFeature();
villageFeature = new VillageFeature(m_XZSize);
mineShaftFeature = new MineShaftFeature();
@@ -68,6 +69,7 @@ RandomLevelSource::RandomLevelSource(Level *level, int64_t seed, bool generateSt
RandomLevelSource::~RandomLevelSource()
{
delete caveFeature;
+ delete caveLargeFeature;
delete strongholdFeature;
delete villageFeature;
delete mineShaftFeature;
@@ -487,6 +489,7 @@ LevelChunk *RandomLevelSource::getChunk(int xOffs, int zOffs)
delete [] biomes.data;
caveFeature->apply(this, level, xOffs, zOffs, blocks);
+ caveLargeFeature->apply(this, level, xOffs / 4, zOffs / 4, blocks);
// 4J Stu Design Change - 1.8 gen goes stronghold, mineshaft, village, canyon
// this changed in 1.2 to canyon, mineshaft, village, stronghold
// This change makes sense as it stops canyons running through other structures
diff --git a/Minecraft.World/RandomLevelSource.h b/Minecraft.World/RandomLevelSource.h
index ef145df0b..b79f851b0 100644
--- a/Minecraft.World/RandomLevelSource.h
+++ b/Minecraft.World/RandomLevelSource.h
@@ -16,7 +16,7 @@ class RandomLevelSource : public ChunkSource
public:
static const double SNOW_CUTOFF;
static const double SNOW_SCALE;
- static const bool FLOATING_ISLANDS = false;
+ static const bool FLOATING_ISLANDS = true;
static const int CHUNK_HEIGHT = 8;
static const int CHUNK_WIDTH = 4;
@@ -63,6 +63,7 @@ public:
private:
LargeFeature *caveFeature;
+ LargeFeature *caveLargeFeature;
StrongholdFeature *strongholdFeature;
VillageFeature *villageFeature;
MineShaftFeature *mineShaftFeature;
diff --git a/Minecraft.World/Sheep.cpp b/Minecraft.World/Sheep.cpp
index f06308f49..6e10d8369 100644
--- a/Minecraft.World/Sheep.cpp
+++ b/Minecraft.World/Sheep.cpp
@@ -110,6 +110,16 @@ void Sheep::dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel)
// killing a non-sheared sheep will drop a single block of cloth
spawnAtLocation(std::make_shared(Tile::wool_Id, 1, getColor()), 0.0f);
}
+
+ // and some meat
+ if (this->isOnFire())
+ {
+ //spawnAtLocation(Item::mutton_cooked_Id, 1);
+ }
+ else
+ {
+ //spawnAtLocation(Item::mutton_raw_Id, 1);
+ }
}
int Sheep::getDeathLoot()
diff --git a/Minecraft.World/Tile.cpp b/Minecraft.World/Tile.cpp
index de113714d..f74144543 100644
--- a/Minecraft.World/Tile.cpp
+++ b/Minecraft.World/Tile.cpp
@@ -17,6 +17,7 @@
#include "net.minecraft.h"
#include "Tile.h"
+
wstring Tile::TILE_DESCRIPTION_PREFIX = L"Tile.";
const float Tile::INDESTRUCTIBLE_DESTROY_TIME = -1.0f;
@@ -220,6 +221,14 @@ Tile *Tile::woolCarpet = nullptr;
Tile *Tile::clayHardened = nullptr;
Tile *Tile::coalBlock = nullptr;
+Tile *Tile::rubyOre = nullptr;
+Tile *Tile::rubyBlock = nullptr;
+Bush *Tile::blueRose = nullptr;
+Bush *Tile::peony = nullptr;
+Tile *Tile::glowLichen = nullptr;
+Tile *Tile::netherGold = nullptr;
+MycelTile *Tile::alphaGrass = nullptr;
+
DWORD Tile::tlsIdxShape = TlsAlloc();
Tile::ThreadStorage::ThreadStorage()
@@ -442,6 +451,14 @@ void Tile::staticCtor()
Tile::clayHardened = (new Tile(172, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_clay, Item::eMaterial_clay)->setDestroyTime(1.25f)->setExplodeable(7)->setSoundType(SOUND_STONE)->setIconName(L"hardened_clay")->setDescriptionId(IDS_TILE_HARDENED_CLAY)->setUseDescriptionId(IDS_DESC_HARDENED_CLAY);
Tile::coalBlock = (new Tile(173, Material::stone)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_coal)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_STONE)->setIconName(L"coal_block")->setDescriptionId(IDS_TILE_COAL)->setUseDescriptionId(IDS_DESC_COAL_BLOCK);
+ Tile::rubyOre = (new OreTile(174)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(SOUND_STONE)->setIconName(L"ruby_ore")->setDescriptionId(IDS_TILE_EMERALDORE)->setUseDescriptionId(IDS_DESC_EMERALDORE);
+ Tile::rubyBlock = (new MetalTile(175)) ->setBaseItemTypeAndMaterial(Item::eBaseItemType_block, Item::eMaterial_emerald)->setDestroyTime(5.0f)->setExplodeable(10)->setSoundType(SOUND_METAL)->setIconName(L"ruby_block")->setDescriptionId(IDS_TILE_EMERALDBLOCK)->setUseDescriptionId(IDS_DESC_EMERALDBLOCK);
+ Tile::blueRose = static_cast((new Bush(176))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_blue_rose")->setDescriptionId(IDS_TILE_FLOWER)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap());
+ Tile::peony = static_cast((new Bush(177))->setDestroyTime(0.0f)->setSoundType(Tile::SOUND_GRASS)->setIconName(L"flower_peony")->setDescriptionId(IDS_TILE_FLOWER)->setUseDescriptionId(IDS_DESC_FLOWER)->disableMipmap());
+ //Tile::glowLichen = (new VineTile(178))->setDestroyTime(0.2f) ->setSoundType(SOUND_GRASS)->setLightEmission(0.33f)->setIconName(L"glow_Lichen")->setDescriptionId(IDS_TILE_VINE)->setUseDescriptionId(IDS_DESC_VINE)->sendTileData();
+ Tile::netherGold = (new OreTile(178)) ->setDestroyTime(3.0f)->setExplodeable(5)->setSoundType(SOUND_STONE)->setIconName(L"gold_ore_netherrack")->setDescriptionId(IDS_TILE_NETHER_QUARTZ)->setUseDescriptionId(IDS_DESC_NETHER_QUARTZ_ORE);
+ Tile::alphaGrass = static_cast((new MycelTile(179))->setDestroyTime(0.6f)->setSoundType(SOUND_GRASS)->setIconName(L"alpha_grass_side")->setDescriptionId(IDS_TILE_GRASS)->setUseDescriptionId(IDS_DESC_GRASS));
+
// Special cases for certain items since they can have different icons
Item::items[wool_Id] = ( new WoolTileItem(Tile::wool_Id- 256) )->setIconName(L"cloth")->setDescriptionId(IDS_TILE_CLOTH)->setUseDescriptionId(IDS_DESC_WOOL);
@@ -1702,4 +1719,6 @@ const int Tile::netherQuartz_Id;
const int Tile::quartzBlock_Id;
const int Tile::stairs_quartz_Id;
const int Tile::woolCarpet_Id;
+const int Tile::rubyOre_Id;
+const int Tile::rubyBlock_Id;
#endif
diff --git a/Minecraft.World/Tile.h b/Minecraft.World/Tile.h
index 307c4106a..a3464cd4a 100644
--- a/Minecraft.World/Tile.h
+++ b/Minecraft.World/Tile.h
@@ -365,6 +365,14 @@ public:
static const int clayHardened_Id = 172;
static const int coalBlock_Id = 173;
+ static const int rubyOre_Id = 174;
+ static const int rubyBlock_Id = 175;
+ static const int blueRose_Id = 176;
+ static const int peony_Id = 177;
+ //static const int glowLichen_Id = 178;
+ static const int netherGold_Id = 178;
+ static const int alphaGrass_Id = 179;
+
static Tile *stone;
static GrassTile *grass;
@@ -541,6 +549,14 @@ public:
static Tile *clayHardened;
static Tile *coalBlock;
+ static Tile *rubyOre;
+ static Tile *rubyBlock;
+ static Bush *blueRose;
+ static Bush *peony;
+ static Tile *glowLichen;
+ static Tile *netherGold;
+ static MycelTile *alphaGrass;
+
static void staticCtor();
int id;
diff --git a/Minecraft.World/ToolRecipies.cpp b/Minecraft.World/ToolRecipies.cpp
index 82b02df1c..6ce4fce24 100644
--- a/Minecraft.World/ToolRecipies.cpp
+++ b/Minecraft.World/ToolRecipies.cpp
@@ -34,30 +34,36 @@ void ToolRecipies::_init()
ADD_OBJECT(map[0],Item::ironIngot);
ADD_OBJECT(map[0],Item::diamond);
ADD_OBJECT(map[0],Item::goldIngot);
+ ADD_OBJECT(map[0],Item::ruby);
+
ADD_OBJECT(map[1],Item::pickAxe_wood);
ADD_OBJECT(map[1],Item::pickAxe_stone);
ADD_OBJECT(map[1],Item::pickAxe_iron);
ADD_OBJECT(map[1],Item::pickAxe_diamond);
ADD_OBJECT(map[1],Item::pickAxe_gold);
+ ADD_OBJECT(map[1],Item::pickAxe_ruby);
ADD_OBJECT(map[2],Item::shovel_wood);
ADD_OBJECT(map[2],Item::shovel_stone);
ADD_OBJECT(map[2],Item::shovel_iron);
ADD_OBJECT(map[2],Item::shovel_diamond);
ADD_OBJECT(map[2],Item::shovel_gold);
+ ADD_OBJECT(map[2],Item::shovel_ruby);
ADD_OBJECT(map[3],Item::hatchet_wood);
ADD_OBJECT(map[3],Item::hatchet_stone);
ADD_OBJECT(map[3],Item::hatchet_iron);
ADD_OBJECT(map[3],Item::hatchet_diamond);
ADD_OBJECT(map[3],Item::hatchet_gold);
+ ADD_OBJECT(map[3],Item::hatchet_ruby);
ADD_OBJECT(map[4],Item::hoe_wood);
ADD_OBJECT(map[4],Item::hoe_stone);
ADD_OBJECT(map[4],Item::hoe_iron);
ADD_OBJECT(map[4],Item::hoe_diamond);
ADD_OBJECT(map[4],Item::hoe_gold);
+ ADD_OBJECT(map[4],Item::hoe_ruby);
}
void ToolRecipies::addRecipes(Recipes *r)
diff --git a/Minecraft.World/WeaponRecipies.cpp b/Minecraft.World/WeaponRecipies.cpp
index 1dbe6bdab..a67b6736f 100644
--- a/Minecraft.World/WeaponRecipies.cpp
+++ b/Minecraft.World/WeaponRecipies.cpp
@@ -23,12 +23,14 @@ void WeaponRecipies::_init()
ADD_OBJECT(map[0],Item::ironIngot);
ADD_OBJECT(map[0],Item::diamond);
ADD_OBJECT(map[0],Item::goldIngot);
+ ADD_OBJECT(map[0],Item::ruby);
ADD_OBJECT(map[1],Item::sword_wood);
ADD_OBJECT(map[1],Item::sword_stone);
ADD_OBJECT(map[1],Item::sword_iron);
ADD_OBJECT(map[1],Item::sword_diamond);
ADD_OBJECT(map[1],Item::sword_gold);
+ ADD_OBJECT(map[1],Item::sword_ruby);
}
void WeaponRecipies::addRecipes(Recipes *r)