From 217db0a4ea40894f617a67b757a80776545417c6 Mon Sep 17 00:00:00 2001 From: Song Minjae Date: Sun, 6 Mar 2016 22:05:05 +0900 Subject: [PATCH] nearbyTilesInfo issue has been solved Former-commit-id: fea5f44cb768a565e3275eb711996758fec5d5d9 Former-commit-id: d24dbd5e87bcd70abf583bcf637d83dfef724e79 --- .../Torvald/Terrarum/GameMap/GameMap.class | Bin 5014 -> 5053 bytes .../Torvald/Terrarum/GameMap/MapLayer.class | Bin 2065 -> 2055 bytes .../Terrarum/MapDrawer/MapCamera.class | Bin 9927 -> 10108 bytes .../TileProperties/TileNameCode.class | Bin 2366 -> 2411 bytes .../TileProperties/TilePropCodex.class | Bin 4754 -> 4753 bytes .../Torvald/Terrarum/TileStat/TileStat.class | Bin 2743 -> 2683 bytes .../UserInterface/BasicDebugInfoWindow.class | Bin 6915 -> 7093 bytes src/com/Torvald/Terrarum/GameMap/GameMap.java | 2 ++ .../Torvald/Terrarum/GameMap/MapLayer.java | 2 +- .../Torvald/Terrarum/MapDrawer/MapCamera.java | 13 +++++++++---- .../Terrarum/TileProperties/TileNameCode.java | 2 ++ .../TileProperties/TilePropCodex.java | 3 +-- .../Torvald/Terrarum/TileStat/TileStat.java | 6 ++---- .../UserInterface/BasicDebugInfoWindow.java | 8 ++++++-- 14 files changed, 23 insertions(+), 13 deletions(-) diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/GameMap.class index b26b822e7b3294fad9933c00215ad9a49e6cd5c2..dd675bac63c5517f83aece75675235b4db8c23f1 100644 GIT binary patch literal 5053 zcmbtY>sK6S8UGC|EDW=-5Fo}SN}Du=jp=HNu{IY40x3!pge??PZ3cF_OtKeTW+ADX z)@oC&T5Z*8>n&QfUa&W_kT$(|`CyOwL664|e&`21$3MbzJl5ay&M*wiNOJT8&wJVT z`8}8S_q@*>e)sQ}UIoyH*L3W~g+{y`4~h7!h|h_5IEv5fsK*y%@kJ4ji1<0)Wo%wunRtjU9vPZFA?jgnK!f6 zU@^mueOsfBnN-UJuv;B5Y!`wUbxU@}nbV++XsDmF?ChMw$-=z3RJe0(GOZyp)jv9_ zAvRbnEI4MtnKW}{i-`s_MAJj#Km-nLru?!09i ze|4|ysOgyArhqBV_*Cib>D}7v029Q5(st>&zEnhO=dT`YkSeLG8Q4rX0*QqnipqkW zvxZB>ylY+E6zQj(|BZ501m)sO^oTrsJ#udq{YK=`e=Ij|> z!W#dIi&kl=WII;iCX!dF0RIlfp8LWGDKvC!MDqhN%67rIC0!gTI5+R7FFgajbg8yv zvCNz4?*_8g_Vltu)poE-xy?FN)DCV(dIrS{#n!dL)R4RyOM*qLPZZ0gS!-CO*zn5g zrqkx4Y2X;1HE=Wf47^*!0TJ&(pN1Q*=`9t2+YH=c zDWV^||2m_HYoLR`GMshhTYw|70mh)D@@gFD++t&|GI3>G~9Vpwmj8)Rm zZo5j|Le*}&Fkg0V?KZHA%Tc^&;3Zr!@G@SJoW9CRTgN#ubK06EmAZ?iY^q=_W!N`T z3psoCOlm@8z&cq(wnQ?DuC?mjYmkK`olV569e3t(I_i}#_c(L+>dpCitB_&y>ls~l z!wu(P@1`v;LcY`ir`^*;Wj8KcC+=bO^o(rQrBZ`aTsz!OUT-oenwxifCvhD=6!x+Q z#xWr5<7_~vs74Y|jU<*D$uf?ba9xe0yBf)OHInokci%)Qd z5uPCd)md^^jbtUq9T*Cn8^%szvQl_{gulLlI!Ny>CRd>)6BX1XyDF$nChBq(M3Sv| zy@I;r71U2Bx>gabpdq+u3@&son$$6)f>?0ToNQ~UAkMAU=~c813fk9w(bet{Q!=dZJKa-0em%zN0eb@`koK_lt2LOH zOK7-+j^~J51BtAjzknWyr-qt0ct{%V2-R;4(Vq&{pA6O4L-bFD>Q9C0$1b6>+J8G# z|4vMM@u$4_>m>eap~{Wb%8Q}OCqtF>YUO)FmG2^jTnYr;j#Vq44^{qX zsB&|)@&lpDe7QZ#<0Pb1TssrinCM!;_IP|QDU-LHTIPO`JQoy}OY?T0hV3v_MH2%v zisqWMhY{(7@V0e( z&Fb!7fX?rm4t~_g`bqR>~@8h`G&s|NO8;$H|B>M^TUmK;cEC8N}idE zG$LmD6OoIo9*MGhIq{@7y>2;Cx3+!#@)hiwzJlHCmN&HRS;38o%jn^-g5FgmUn5AZ zYB6mJ@RxM$SJ;kU^Is9a3AotryV#Ef=3LrQzj9WZU%zs;77pk91~Bv{9w=kc^LD*Q z?yaD)Ivc;G%InJ1<{r7k&mHNJXTz}?sD_-WK74tL3$5zNdV(SSekA3}e|HvGlUjBxnl%!g#5!_QF%Gn1#0ZQOT%mCQs@ z)A}#@FNcOt;FF#Y!RFEa3{M5$?7u2IZo^;idFOFoh;qF8k$WRl`F?!LQ(nIneyYW* jGx;}W^6&p8lk!n0Q9OW8hd8pWx{LiI)RE7qSReckBW|3r literal 5014 zcmbtY?N=OE8UGC|yD-ecLV#Eols0L)Y)n^ajJ0`bfrJ#LNd-!Zsj&k)T_)KVTxKEB z8l%RxYSmWjORLt@w`!#|)hyJYt$xs>{h-I=2S0c`dX9gE=Xk8Y=gu$;%Sdwc1JAwp z+57ySm;1Z-nZxV@_M(L7NP{PPW&JsHCnb+ox~UlPqzO+@%|6Zd~bu)eBO_caku3&t}t`?`p4$gkfN z-Lo-#OEi~6JSXDYF?=V6@9Nlzi;ei6jNjMsJboavAL`hF7h?F4hNirE&MKcU^LY)o zjLwt_nTb+)!OUkf6IQuwmMewKQL|v(W6ovxH!7R=YcQ0R+F=)c5W8$?XjvrIVY6W7 ztf5ktialGS-fPk<8^CUJ#IaorVl*t;S!Y&*HliUqYuUM3hm-j^bFp~;+GI*Y7n z3N5FhHD@{A2@bH}=Oo6ylP3pxy8J~L;i=V=W@W z?A37dbv>E_Fl^vf>@n~*5gF{!uzO3}jRZE(k9Qb&yNChs{C90>?B``*2!{>aiMtHE zgdZEYEaGLHGB6_|E8-_2EZ7ESMf?;+16S~nhMikF@k(UC6#EZ|n8qm$H%ZMhd9#?y zjO6oH&g5H?s}!uF<3CUuwy$p*cgl7#H(0UrS*xs}!*-2&g{r-FajxRr(QBZJ$@xQbP&>Cbu7)^UzcpSEU5rQT9Gmnm9{SvH8weBPcplNlEo@J<$yEs?CEYrT5+ z8f76xXSeX~jyrQX9rLa)b)31ns5v)h6|?MesnPW?+;sN$ZBls|@}&+0?d~Qj+it}= z&Z2jwMmF2hsL?5{ZSEkiH#ro`&Dy?6+{iD2-E4NP7!>w#HYik7BZ;U+5=)I_8AnaH zu13;bjbywUNqUYq;C7B0-pzR(?%;ZVV10n=gMsxS?jZryUUFBBWF^NQV(@10_oH0> z6%CN4TuQG%ODC(SOLtdMpH4R9tB9oA@Y^aH(yNG0CA(J;tD-TuXbLWLE}GRgql$QN z(UNX&ts+5H+tdo$tJwCk3g~XieTY-`Bf|8Xm_Q3}dndKsOt+88?qjM$O!ZzIAl(n~ z2HlAw6C0sbuNykvgZFa9Bvc7CHIpLNVU+U-6TXLk$8eldl9uAsag3&SRMD{>i>|ao zEXiSo-{tP|@uQ65E@EhSAI3baezgYcas`c7(0Q4-b&$-W`~{3aA~n>!(L>TO9%|nd zVt-$#{Y0p}9%6qg)c(Fu`}h@f)yAI-wV%WZFaL~}e}m*-YdjY)Zt#=8Kh(IX*4PO( zo(eVAYmLu_8owVWL&A>N8b2Ir{6MI2ORe#RP-DK-p64+VQf^!a3)YnEUdHxBVm2+4 zH$AvSeULmC6_!i$4xfe{_@KJ!#K41!=9;vF5d6js_&03Af9$&P*J!(E%KjRH8V^N%>bg-aJmjH1z^ff$1rj{9 zo~uJ!Z+J-zrpc;fem zm(v_0Y+z1ZE-QPM(Zd-}qBF9Lx2*eXQD=V{I=^Q+`4J)jM3wf0J;S=JWob|l(#6rDS>3x~rSN<>W1-22l9ZWGUInTH-nonqVf3jy{J!Q8m zT;&_S8YpqxPdDzT8~4+Vd+BQINpqf?OLQV`29l9Wygia-?^5y^Z+hcWvSCeq)6yz- zOs!%kyXDR8yOwcF@)e{wETeA)>DLHSuUbsI0(_OBy@u`hCI83pt3ZeYeuxA35Nj^& zXg~!k&2K;jTaPm5{01=eW^R~=<3+pPBX?KPR9lT-)8seG)#e^q;pdI?$c1pM##*f3 z5$p9WvFfmhvtC>ad?4!?a%Zv)7tTKogX0_L4?d5ER diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/GameMap/MapLayer.class index 6c742aa3d7c326d687e410a77a979ef8a2e0794d..61b4276a19508f671928b930c028405fb0a7ca04 100644 GIT binary patch delta 17 YcmbOz&@M2clZ`dV(a+s=zETnN?x diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/MapDrawer/MapCamera.class index ab953514de02ca13eb33960c91be9df3cffe67ca..6be81442b78f706472021623cd68d8108e95c13e 100644 GIT binary patch delta 4731 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 diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TileNameCode.class index 6421f3f38db7ca650c9f43c67ff0bdacca7c92b7..fe2c907ff171efeb8b7492ddb3894c18acb248cc 100644 GIT binary patch literal 2411 zcmb7^NpKrQ6oy~h+O61QCnPr6Ll!%m;w)ry62{Wl9x~D>qmfL)qKs{kD3PTg%UM{% z9(KaM-MCUzQ4|HmAy=w6aplUDD^~*Ve?3le1RcJ=U-#?or~Z5T*V{keBBK5DRf;lH zPtgUsn55m*0Oo-v&;l+2PXTRU0q6jWz-8bHa22=)JPkYpJPSMrJP*78TnAnRUIJbQ zUIAVOUIShSZUAopZvt-tZv*cD?*i`u?*li14}cGWkARPXPvZ1xoIX?3ZQ7n9Wh+{i zZ8aAUa$+A9{S)s5<;XK}SD*R!fww^+3JU=j#y&n<+_ zN!P(<=q=e!1u1Dsaq?Ed_W95BAvDXLot-kBY&p*pJ#)J1mB(=sXj*y8GqFq>QOPV8 zr)-aBCK38>(L56-=4>ZL zE9%FzrM%r2g3Cdgs&qC^pQq^y`ZCSm{AijE01pBOfkVJy;0SOO7z2(0$AJ^TLx2g4 z16d#kSil4@2}}Vt@Gx)^aDY5e09>F5oB}+c1o%K1r~uQzBfx3k4DcxM81Ojo1dS@% z^MB7!k%806G=k>2j5~9oHrr7&`d?RpF>vClqLuX~Yc7}%&ei;u$?jb<=jPh{WDMK( zh)o;$70U1%vy+Bs4~_C$vzMbT+Q%`Q!R;aVA!*=UW|Y0N~HTI>iV9#BN5R^RL9Y%j$<($ z$74E9#G;ayjKxG#aXsD>*W>B99$yyMbsVm)Lq;$?!Bc*e;87ZAJY@~F~h>_CuY&Uvz@{WGGZS+ZLJNxOM zu(=C%DS}t%~?hU_0k~q(FW?LVH)7CYB?RE75qG{1*0T-_Tb2fws{tUg;Maq2G9)-}zhpgLcuM{N?_| z_vdfgqhhpI_0c{xNc+`BI-s`GLA8$#sWCdNEIOhJbW}~#F?E(ssEb^QqH|nt7oGnX DpzF6! literal 2366 zcmb7`Npuud6o&6hdQOv60zxA5oCG8RWRieZx+_UZbyZVc-4Ps`O434OryDyR1V@~4 z7H8eM^SJSNJbGNP^&D4j-MV$_R`kF3Re+^t@%?q*yZ61@@2`3%zux-!CK26FUuI|@ zozKt(s;B8by2yBn(O@hxnv53X660w`o3X^`FqRpY8P71TFs?G5Wjx1tp78?XMaD~v zYmAo}uP|O^yvBH)@do2f#&yP9jJFx@Fy3Xn$9SLd0pml)4aP@|kCXICl0H?`ZQ8yf zWh+{hYc-cTVY5>S8_TtB904hcmjchV6!nT$PnS*Kx2?RQSl;#n%uoAfsiY`dbWHbD z)%E;>=_u;ap*88bXKqK6wx63()Tier9nZ`AUI~k51HXKCu?|;?b+l3(MR$s0CDTPe z8J6m#W%3p&34HFeM;`N5$>MgSEXT~9Qj|dN6${;FJm0G3ykgP9QKUGqeb0>^r#*+4 z=h2ewR5&FoDNez1?EvlfacGu(J2zuGxpD!8zBya<%ai=u`Ozv^zRAmEIVzdO;*9O1 zGRZ9Axz$Tfp9){deArg9wh z;*f(WxKWJ^By_{Y8t-r%XFW0Bh_=p@TFdSE+7$8?^>f)u z-oA_BjE5Pg7!ISra2Xz>$T-dL86`%*C^IUIS;ixbGmNv0M;VXNxT5j@ zdwhxvKA5pa*gQYx&0Va`cNFdaudA>pY{C^qYwJyDK3ojX*MgP_5p~f4#P9*nLu`d8+z^E!qVPl%wur(RQJ5nNe?(!CC|nYS zQKIll6n2TiF;SQ%3g1LwohaNBg@K~*P!u+b!bwq>DGEPDVW}uw6@{^)@KzM|io#)0 zm@EpPMPaol+!lr5qVQZ4wu{1fQJ60Z|3&c%K)Z0Zc+J5oqA{p~#z%i7^_@(g0~0cs zq7ctnoj`Lmk0?b8E5%)-SPXxv8SDOuy1u9GSWGk)*Ks_q<3vKo$%KwmiMZsY6A95w zQqT7!^?Wv|=T{~5d~Zt6_oei_k<#=1DLp@sO3FH`jcB7aMzrERMzrKwBU*Ev5iL4s zBz4u0kxWVXy+*XpdL!Cs!^%z@jcBV)Mzq&vBc-dh7-`+zRwJ$3+h(M7f7^|;Zg7W@ z(K$PfjLz9*WOUAMBcpSMjg0PR#OTqLEGpn z+D>274*HgM(hszYZqjc0g+}N%?DIQ5%|B=_{fQ6tFMO(h<335ye$__@)F2&HTj`J* hrNinV9Z?f>R9SRPxpZ93(g`((J5f;$y>`)){{m!tt?U2* diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileProperties/TilePropCodex.class index f24b867dc4b71fa2120595defa14991d8020a0e9..a6f7bdfa88098cfd58e20cab52f90d4537b41257 100644 GIT binary patch delta 235 zcmWNL%}PRH7=)h#2gNx4e0Iu3P-sUeL;ML5B#a8RqSR7TQ9(nag@wDIb?cx$Y3sUO z;5D?ZEAR$_piAgo4a__<%xm-|`tfagt?}UQdN^?IM-NVNzA)XMco36iysQvnl}*uY z)=02HmN19JD6mCQ+*5Y6@_ng<&=~@xP^8I`)qg&%_V93kMPAZ<;vCJVe%mONSmFd* z%IloT$T_=|1*&jNl}j$@Qsag?6B;~n#S=}QX)~k4yQH7=^lzYL^mS2HjG=y0HRD$Q TsJ4pWlEW4beo>o1u;EGkmxx1lx>;mklMDGMqDHKGYo%*+lJ8cbvmRJ03PyAJB3b?bJ4 z*Wk9Up=A(s3w^wc7vAG@@DhA{#nXwK==S0=^6$D2elBMS=A;qJ^kYNcBiRY!xFncl zO5rKbGtDxyY>;7_MM70}S)js_ILS}DqUm)URmtUu4A_;BXbmi4H W&9(g4Q|mE|ua^NSWfxDH>Eb`$ek@}E diff --git a/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class b/out/production/Terrarum_renewed/com/Torvald/Terrarum/TileStat/TileStat.class index af025a93b27c610db1dd8466d85519704904d13d..fb1caa18073b25bd648545b4c27f3d6174c71cba 100644 GIT binary patch delta 1224 zcmZvc%X1V}6vlr&(=$EY(-UXLbe=N_bOn{9GzQ2h3gKapU_ew9UnogP2*emM67Yo+ zV2s8m(xUiSSZvt1FhIpA0XJ4zg=JZ~vRvrSt$%Sdz8l<9%qNe z6Xv>UuqpCn=&;jafWh!?D75Wz7-l4d-64!Rvh4|BuT#$$PdSY9w8cc2_Zf?Q7SGO| z>@b2KjKii5lfkywZ1Zz2`$9384p2Bc8J3Lb*TP0UA7hLkit1j2erFgAN!ZWMXmXcl~6qZ-Eic$s=1690I z%1ajhJJpqJ&nh{dm^HRFYVc$b zR=veCK4m$lwXkz^bDk34avML%_OtGO7HbS6$lG=CwX6#|?ACH)PqW5X?5@%@u&NT% z+z@97x5PVm$yMp zZ{i;1yHQ>XwSc1@a|TrkU&v}iOOcdBe=#X#x&fmr3RoN&^_P;%a=|`JEL@^%{qs6) JmMzAXe*i9}%ryW2 delta 1278 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 delta 3018 zcmZ`)3wTt;75>kiyL<26Og70z5)yeNpb%mJDym%$YOi{O6xD z=g#a;U!CTA_0pji0i;rgg(3tD9B`o)eM%fu;*f#EE@=3Hg(G;;f)g(p_@M<$`5v_( zam>PT{K&$O@e>O#18*vjlS=%|gzx7H>K7J% ziBlHd!mmvHT8*bo{6?+3Z83*;OuVZ+erw`)D(;Ml_tf~li4WBHp^EsuiI3Fe4<^p4 z@sB3{WZ}>FixPiT;$tQLX5#M#J~8nR6X!Vpr;6@BEu6={O#Iu#XDaqTCN8K=U$pQ! zE-4=U%!6POS@4j?77`ptx)Kh9oC5tmcAHLyNv1_EvP=pyNg5Pxk((m8P!y@cqVy@n zsw}nS;bKrhG;fTqvuF^-C=sisgO!L=%kjF`tGwT!>rEPB(on7<4Kr!DNeO!HmLO1~ zK_d(r*?W>!Qg5ZGq8OguV9&d4CFRm&f|ih^v^)Zhku-&-N<4+9gJGq1*fjF;L3PwLGzVew zugrP9oN;echOlKV&FxLqHPv>^bShA&w-a1V&3O&WSJ>7WRKUQE6|JrIbf$`PBrK|5 zR&LNNNrhA-X*SJ~G*^jvG{>K6metLt1qKyMDxp%2Zd=|^!_iDUg;Os?4|7}4dRJ4G z4Y`QQ3@VqjSmn>AB@)lzy9CeFrjCTF=7#3>mV~yN#vq%es%Y6%A@LYCN_+zw{WrUY zh(@aP7rNq{Rg$Wy#^2-`@2ypPStjWYTCO7MB%Z@|N%hnqsgartYL>Kuypr3+E3sFJ zUNvo@R!MEt>VMZYMzqtdewUTv+==akbajTkMb;y_|AKp~{~h=6-pvuu(%4$QG6>5c zxJ9{f_#T03C41y<;?d%D?l_js{>G>qa#pa-1D)kCmctQ-1fC~iC0itW0nundE02UW zw5vG4@WRD*=-%FwQR6gUABJbj?Qms=d(tyyN~G&BtkMGr^JE2ZeVk;YebsRxasfcm+VfNfoJtk6( z0n7=2Wuj-E-iP^J0W4tPeTd5N*tk(Xgn;9WKpKhzD2esd^}*f6LoM5ssnj-Icg3`j z=W1yYj{%hVO9qYdm3ztqSbT-vk`TS6OwZ2l2xU*{L512!oM}UUAzRS&g=}oHv+)?p zW=9T@wKk^^O*7#Cd{E@I94bQ`sxEVIhB)knM%{FtK0}(8s7=t)kj90FV67f1LTpw z6dH-Cl!s|ljeJ^%0_w&L+KQR91G8v13MqghI)T}A8gu9)%%$@vWm@y;0v1p|iZy`} z&A>t}5lgfQsA8%WS_Ue$EL3aFsM9)8uWdquwg;`6?;zT=W9ZP{M5lHdcWP&Gw{{Nq zXcus=){j*p3_cNoPT|375swE%5*`$(=n|8#M&#omF&k?|Db|T4Y_G(6QG*Sl5s!*a zJSKeDC?00p25b`DctY$%x7fw{9&8o|@T547r+ngdJT2bB7I6k!#aTQfKIVl_uuXi5 z=fp*9*PYm*yRlP`$2NT^cIl(>f}VjrdKT+B=&?W6i-_Y2%|{11Ayu7lCzm{&tCf$t zSaWmDyjaCr1XoGoZrlUOHPPWyYPkBELtnbm?!|rT>u1e}`}yS^rjNka@O3`#Bz-WS z;R75vSzN+{4Cp|a_z+#JIZ-c8VGSOFfmYtuTGmWH9D#Ls7%uA9azoliZ8sian?>C| zZ3ot~8pbCjuz@wHWoddy>!erkC_{&92WgGEYT?$7(S7Q^MWl$QQQS%VL9naFazEEOV4qGx(Ah2~FL3THyeD*M2mSACBT@HIoegzxcZY(ERgVN_KVx>|@}l9vY* zfi8C$2Zg$fwdZZRgk5+c1U8X@)CPQCLOWrj#n`I@(RO1G#}fAPClMqx-kt-F-fM#=*wOm6(Wm}r^gcVs{{I3u6j;ds diff --git a/src/com/Torvald/Terrarum/GameMap/GameMap.java b/src/com/Torvald/Terrarum/GameMap/GameMap.java index 4c4103d06..df40988b5 100644 --- a/src/com/Torvald/Terrarum/GameMap/GameMap.java +++ b/src/com/Torvald/Terrarum/GameMap/GameMap.java @@ -42,6 +42,8 @@ public class GameMap { private char globalLight; private WorldTime worldTime; + public static final int TILES_SUPPORTED = MapLayer.RANGE * PairedMapLayer.RANGE; + /** * @param width * @param height diff --git a/src/com/Torvald/Terrarum/GameMap/MapLayer.java b/src/com/Torvald/Terrarum/GameMap/MapLayer.java index 2e0b03b4d..039c0e297 100644 --- a/src/com/Torvald/Terrarum/GameMap/MapLayer.java +++ b/src/com/Torvald/Terrarum/GameMap/MapLayer.java @@ -14,7 +14,7 @@ public class MapLayer implements Iterable { public int width; public int height; - public static final int TILES_SUPPORTED = 256; + public static final int RANGE = 256; public MapLayer(int width, int height) { this.width = width; diff --git a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java b/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java index 3de6ac7df..582a3336d 100644 --- a/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java +++ b/src/com/Torvald/Terrarum/MapDrawer/MapCamera.java @@ -64,7 +64,12 @@ public class MapCamera { , TileNameCode.DIRT , TileNameCode.GRASS , TileNameCode.SAND + , TileNameCode.SAND_BEACH + , TileNameCode.SAND_RED + , TileNameCode.SAND_DESERT + , TileNameCode.SAND_BLACK , TileNameCode.GRAVEL + , TileNameCode.GRAVEL_GREY , TileNameCode.SNOW , TileNameCode.ICE_NATURAL , TileNameCode.WATER @@ -211,7 +216,7 @@ public class MapCamera { int thisTileY = thisTile / PairedMapLayer.RANGE; if (drawModeTilesBlendMul) { - if (isBlendMul((byte) thisTile)) { + if (isBlendMul(thisTile)) { drawTile(mode, x, y, thisTileX, thisTileY); } } @@ -414,15 +419,15 @@ public class MapCamera { } private static boolean isConnectSelf(int b) { - return (Arrays.asList(TILES_CONNECT_SELF).contains((byte) b)); + return Arrays.asList(TILES_CONNECT_SELF).contains(b); } private static boolean isDarkenAir(int b) { - return (Arrays.asList(TILES_DARKEN_AIR).contains((byte) b)); + return Arrays.asList(TILES_DARKEN_AIR).contains(b); } private static boolean isBlendMul(int b) { - return (Arrays.asList(TILES_BLEND_MUL).contains((byte) b)); + return Arrays.asList(TILES_BLEND_MUL).contains(b); } private static void setBlendModeMul() { diff --git a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java b/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java index cdedb98d6..e07b1eaab 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java +++ b/src/com/Torvald/Terrarum/TileProperties/TileNameCode.java @@ -29,7 +29,9 @@ public class TileNameCode { public static final int SAND_RED = TilePropCodex.indexDamageToArrayAddr(5, 2); public static final int SAND_DESERT = TilePropCodex.indexDamageToArrayAddr(5, 3); public static final int SAND_BLACK = TilePropCodex.indexDamageToArrayAddr(5, 4); + public static final int GRAVEL = TilePropCodex.indexDamageToArrayAddr(6, 0); + public static final int GRAVEL_GREY = TilePropCodex.indexDamageToArrayAddr(6, 1); public static final int ORE_COPPER = TilePropCodex.indexDamageToArrayAddr(7, 0); public static final int ORE_IRON = TilePropCodex.indexDamageToArrayAddr(7, 1); diff --git a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java b/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java index 34d21a620..b2fe47d9a 100644 --- a/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java +++ b/src/com/Torvald/Terrarum/TileProperties/TilePropCodex.java @@ -6,7 +6,6 @@ import com.Torvald.Terrarum.GameMap.PairedMapLayer; import org.apache.commons.csv.CSVRecord; import java.io.IOException; -import java.util.Hashtable; import java.util.List; /** @@ -17,7 +16,7 @@ public class TilePropCodex { private static TileProp[] tileProps; public TilePropCodex() { - tileProps = new TileProp[MapLayer.TILES_SUPPORTED * (PairedMapLayer.RANGE)]; + tileProps = new TileProp[MapLayer.RANGE * (PairedMapLayer.RANGE)]; for (int i = 0; i < tileProps.length; i++) { tileProps[i] = new TileProp(); diff --git a/src/com/Torvald/Terrarum/TileStat/TileStat.java b/src/com/Torvald/Terrarum/TileStat/TileStat.java index 3d2721556..7e2afb857 100644 --- a/src/com/Torvald/Terrarum/TileStat/TileStat.java +++ b/src/com/Torvald/Terrarum/TileStat/TileStat.java @@ -15,7 +15,7 @@ import java.util.Arrays; */ public class TileStat { - private static short[] tilestat = new short[MapLayer.TILES_SUPPORTED]; + private static short[] tilestat = new short[GameMap.TILES_SUPPORTED]; private static final int TSIZE = MapDrawer.TILE_SIZE; @@ -30,8 +30,6 @@ public class TileStat { GameMap map = Terrarum.game.map; Player player = Terrarum.game.getPlayer(); - float zoom = Terrarum.game.screenZoom; - int renderWidth = FastMath.ceil(Terrarum.WIDTH); int renderHeight = FastMath.ceil(Terrarum.HEIGHT); @@ -82,7 +80,7 @@ public class TileStat { * @return copy of the stat data */ public static short[] getStatCopy() { - return Arrays.copyOf(tilestat, MapLayer.TILES_SUPPORTED); + return Arrays.copyOf(tilestat, MapLayer.RANGE); } } diff --git a/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java b/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java index c9fd1e1d0..318abdc41 100644 --- a/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java +++ b/src/com/Torvald/Terrarum/UserInterface/BasicDebugInfoWindow.java @@ -2,6 +2,7 @@ package com.Torvald.Terrarum.UserInterface; import com.Torvald.Terrarum.Actors.PlayerDebugger; import com.Torvald.Terrarum.Actors.Hitbox; +import com.Torvald.Terrarum.GameMap.PairedMapLayer; import com.Torvald.Terrarum.LangPack.Lang; import com.Torvald.Terrarum.MapDrawer.LightmapRenderer; import com.Torvald.Terrarum.MapDrawer.MapDrawer; @@ -92,10 +93,13 @@ public class BasicDebugInfoWindow implements UICanvas { String tileNo; try { - tileNo = String.valueOf(Terrarum.game.map.getTileFromTerrain(mouseTileX, mouseTileY)); + int tileNumRaw = Terrarum.game.map.getTileFromTerrain(mouseTileX, mouseTileY); + int tilenum = tileNumRaw / PairedMapLayer.RANGE; + int tiledmg = tileNumRaw % PairedMapLayer.RANGE; + tileNo = tilenum + ":" + tiledmg; } catch (ArrayIndexOutOfBoundsException e) { - tileNo = "out of bounds"; + tileNo = "-"; } printLine(g, 9, "tile : " + tileNo + " (" + mtX + ", " + mtY + ")");