From daa549056b125bac9dec16f86204a25671916466 Mon Sep 17 00:00:00 2001 From: fred-boy Date: Thu, 12 Apr 2018 19:08:38 +0700 Subject: [PATCH] More blocks, trees --- android/assets/terrain.png | Bin 4096 -> 9191 bytes .../src/ru/deadsoftware/cavecraft/Assets.java | 2 +- core/src/ru/deadsoftware/cavecraft/Items.java | 15 +++++++++++- .../deadsoftware/cavecraft/game/WorldGen.java | 23 +++++++++++++++++- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/android/assets/terrain.png b/android/assets/terrain.png index 821b3e37a80a41caa072e27b032627aecd9c14b1..11be603c04fcd1a53fa7ce91fa8363cd4ae2a20f 100644 GIT binary patch literal 9191 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 Sqk&g)K)R0%G|L{^zxW?v2g}_6 literal 4096 zcmeHK`#+QY{~tNj;#NuS5;{l+LWFK&R9d(t=cJ80XJTR+TiZx-qbON&p5%PWX{!xW zZXJX<4`a?}Hm5OW_PP2azQ291>v28a*W>le^>{sB&)4($ykhU%hDw8vfk7aUwE3+Y zwjhuQ@G1h@D*+t$gA2WYL*juY^ae=y`zF>Gya6ivf^Ip7fI$0Ye?KCiw2VK2q9oGX z%1m-xOlqJ0#Z}4nY!FE1rTGn0`>??!CibB{H|zU~wHh{fuxqX z)Nk{;A_KpyUYfS{6fHt^O|72On;@TN}*DUI)|5`?mcQ2cFz9)UKM-2l0=B> z4|shT&HvXbveMd)dH#A{roep~g>FxMyJ(@O@RQG#@t$t=^&R8$jWb5fnbqFbSC74H zX`fgrBoa-MdWMI~T3Rg3P940s@p-o1Rn5o<77`MYmX?;JGBr7Q?ojMGO-<|Q=;*lS z2WeSZeM3VTUESSs@y(YnUCLQq4Hj&F1#@9aDJs&@r;|Pmro|<1N>u#q6I#SDP@bQ4 z3b2ZPpz!z}KHKMV@yg1hmoHw-jyK0sZ~}^o?@W6%9f?F178F3Ojki9a(P;b3wX)|o zp~oRk;g4cf&L4^Q^+30vm-H?hyoU&5qI@a)sE?Q8Ha9j5SZjPiaakEbMfdXM!pcgU zoIAJTvFt9*4cgJHJN8NCFqbPSgj(L_TKH5YE%1rXQpFyQs_XHj9`(?{cF9tj&v?e< zReU1S4g%T5Uks6~a|sMAS1AGz5f>MqXS3hZXR1XtE?%_K(b2g_a4OzmRui(a%FFR{ zU8^+p&eql!`T6-Z;Y&B$rVji27?c9Nghdqk~AH7?|545EVCP`d^XJ(fD#4FegjFffG4#`}wpueH{5O6|z zRN7YcQGislF?i)(1Zg<;4wUAYg4PZ5yhcCcs`jJi2v^iKJ z3Yb9B2q#6Qx3{;5L~;aJg`>IVuEo0PMFv#W32OK89P(n##;I!UA%oGd3ezW&K6KGwgdchpGG|2n zJ#I7!FB8X~L%Mt>@@^3ES~>n{UGugT+Zu`fEo5^;#~X*|XUSDmqqP)1`10X|!Xc+u zU8i_YjIrEar|n%n#{mW_E674yDC2i3i%UvE1>2#X9v-tS45v48k7V-e*C%Ns6^e$B z&p{xr9GbAD$)v5Q=J!hjoz8%bOS{ebK<_##)is~XT)*DT%drU zam5&6@x)HLhD6F2qtx%{fA_M{id=$=wN~y6!;HFI{L24%!uqW+61M+Kpo7G{E2MUP z*{kGMQ8$a7v9W(j787sgCJ;5%)GR-LqEcOC#QJ>B4V4!+9xH>{6r$jK)h&1x3XeH; z@b=3T`@=lK;XuZoNL_=0zud5ybwSi^d*WakxIV;V42{BcXsDLgQ$i#sz(C#HwAre|(pE6t%EK1l%IEf6 zAOak)va)g<7-2FO_HMgry<6oYe0(~Th0WK9=~b-EF(-n7n&{eJYu*JPOsdOzDy%j3 z#ys3_T3;sJ|NT_ZFLjV=hmlgE!!&cxh`m_;wU1=5aklk!nD=kaPc?`F%1PeleNmI` zV|-*STrID&t$6S62^K zy2rG%w5-n+WczKcPOYNrkNx>)$CoI{sg>25pjzB-@|Pv><6Cde!YkR67JX8liJ35^+J)?qt79G$0hPU{BoUGJS^N zT`B%$7jBZosuiakvB2tDqV+!CdI;=H(0-u7YUrthd3kx~l@blLaVm!@pX1mTL}2KN zXR1j*d0Xj^eG0KT_!JMT#kR`xb9{|N7iVDsJlmhHg2|BIDP`VhL% zH}~W9>EiNoM+XN28iT2QvK3r*|Ff+>qr5kIzq~y>!`~B&8C6gnm8};V5Jr4>j1M)~ zG>3ZaiOpX7*`8^f+CujHETbXKxyami0y8si`yQ;7YIGQUUSHp-ySqE#g)%t0G$)&S z$Oo9CqG9HBBYq|bMP$lLcI(}3YPcS2Lavq(-9w^^Y44YiYox;mvy3p~Y!<7{=+Dc9 zNR{F2ftkH`HkS;7lt?4f2JgEkOl^Bl_tVR+cxdvtcMA>`dBl8Hm9#Wg}Sw z8G~ymN=Y=ftIGScG_N{a*oZj|i zg=2YRF@sf}@maWS-{uFGYRTkZ3tYdM_Dl+zTTG!)kSpV6*p+7axSP4)m?rd6E#tDD zUOtrLnqu%Df3;3;$YHTx#*M?5-dt=H6S{n%POu}1PvaOU55Mfx{rz5`=_79b{w2p0 z6cp`*dE592+HS~LztNVyGrnjbqDfMbu5SC_8b}WZ-e(%3=D#cBd$!hQxC7qVbJ6nfj@PH5 z_D)U(U%y_HlarfUsGvETo5#Y@b7ufGR9`XDzG;g)pU9%!uDq-635oFCGZcwHh_rTa z?4dMvNztp+?exDIvAVHq*;%R88)E%2`04&u@p~>VwRfWrNJ+?nqmco)&7>#@e_{FA zdp6jFbZF$@(Bqg4)SlyeuHTFJZ37CCe=n!MK)6Z)3tDP%@=)yE>!y4neYiT^R}jKv zSF-faG|X|^PA%J2D90iF_!~=rKiheE<)3y(^nWyU#cg?N%X$@&$xguN08{FUk})m} zy7G{_%a($SA6o`Ye=f%=JRyh3*U7Jg^mbNYy}i1>ZMHYdaF%Sa(EQs)t`iu}$6_(_ zN8)mfp077g$nL04Fy*7%w0s=EId^^>1E;BT0!0=@5U$6+%Ek@Oh&gVcthkB_k@K+l zW~x1i+$!a^$sT^he?|AeH7TvLHz`zV?V|yd|h1-)zmuK(lRBv*!%F>oSPfR6*7Yl$5YrG7 zSIa@fFbdRq{KT0iCi59KHfKzmBr4pAiLjIw9x0I+ifSAvcTXT9C0A@02X?*6_35H@ zt1W5?YYU7DMhig=@R9u3*nRc9@%UrP%8b!bx8TQ}XU)-UYul(HtZ)RjFT+RqqnBjj zBF?Z)tormaLTfMbzn)Wc(JOs>opeW)#NgY_yZVTAnY#Xj#$@qP%EfLbhYP_(UHrn0 z6@Mx|dc;Sh_3=nmRaJ8RuIh4ICdf|l-Gx#9F{l+Rmj_p!&D(xC(Q!}s?1!-fxVNHA6D1axL+idXJb@~ zGXPk-(9qgHj$a}6d(m#@7nJV8lP1QLG4Wd3MxFsjm5wP^-V;$@|y4-ATVFJa3Sd^Cyf<0AzcQeI>IaTJDXCH3qOB$1{eZlR}y*?w`Q$b74Ecm{61)^3ZuL!kF@MAt>haLCca!KSPzMQl^`k72n1>U; z10tT+}FBdUFYArHR_4khXikqoP4Sb{5t;s^?!{3kG4EA3HjN} T;fUw|{+7Af?HlFS+@AgqX{5_b diff --git a/core/src/ru/deadsoftware/cavecraft/Assets.java b/core/src/ru/deadsoftware/cavecraft/Assets.java index 9d06345..6a99f1d 100644 --- a/core/src/ru/deadsoftware/cavecraft/Assets.java +++ b/core/src/ru/deadsoftware/cavecraft/Assets.java @@ -9,7 +9,7 @@ import com.badlogic.gdx.graphics.g2d.TextureRegion; public class Assets { - public static final int BLOCK_TEXTURES = 9; + public static final int BLOCK_TEXTURES = 18; public static BitmapFont minecraftFont; diff --git a/core/src/ru/deadsoftware/cavecraft/Items.java b/core/src/ru/deadsoftware/cavecraft/Items.java index 2b24741..001ac29 100644 --- a/core/src/ru/deadsoftware/cavecraft/Items.java +++ b/core/src/ru/deadsoftware/cavecraft/Items.java @@ -7,7 +7,7 @@ public class Items { public static ArrayMap BLOCKS = new ArrayMap(); - public static void load() { + public static void loadBlocks() { BLOCKS.put("none", null); BLOCKS.put("stone", new Block(0,0,16,16,Assets.blockTextures[0])); BLOCKS.put("grass", new Block(0,0,16,16,Assets.blockTextures[1])); @@ -18,6 +18,19 @@ public class Items { BLOCKS.put("bedrock", new Block(0,0,16,16,Assets.blockTextures[6])); BLOCKS.put("water", new Block(0,0,16,16,Assets.blockTextures[7],false,true)); BLOCKS.put("lava", new Block(0,0,16,16,Assets.blockTextures[8],false,true)); + BLOCKS.put("sand", new Block(0,0,16,16,Assets.blockTextures[9])); + BLOCKS.put("gravel", new Block(0,0,16,16,Assets.blockTextures[10])); + BLOCKS.put("gold_ore", new Block(0,0,16,16,Assets.blockTextures[11])); + BLOCKS.put("iron_ore", new Block(0,0,16,16,Assets.blockTextures[12])); + BLOCKS.put("coal_ore", new Block(0,0,16,16,Assets.blockTextures[13])); + BLOCKS.put("log", new Block(0,0,16,16,Assets.blockTextures[14])); + BLOCKS.put("leaves", new Block(0,0,16,16,Assets.blockTextures[15])); + BLOCKS.put("sponge", new Block(0,0,16,16,Assets.blockTextures[16])); + BLOCKS.put("glass", new Block(0,0,16,16,Assets.blockTextures[17])); + } + + public static void load() { + loadBlocks(); } } diff --git a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java index 6c09cf6..d4635fd 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java +++ b/core/src/ru/deadsoftware/cavecraft/game/WorldGen.java @@ -29,6 +29,26 @@ public class WorldGen { return res; } + private static void genOak(int x, int y) { + backMap[x][y] = 15; + backMap[x][y-1] = 15; + backMap[x][y-2] = 15; + backMap[x][y-3] = 15; + backMap[x][y-4] = 16; + backMap[x][y-5] = 16; + backMap[x-1][y-3] = 16; + backMap[x-1][y-4] = 16; + backMap[x+1][y-3] = 16; + backMap[x+1][y-4] = 16; + foreMap[x][y-3] = 16; + foreMap[x][y-4] = 16; + foreMap[x][y-5] = 16; + foreMap[x-1][y-3] = 16; + foreMap[x-1][y-4] = 16; + foreMap[x+1][y-3] = 16; + foreMap[x+1][y-4] = 16; + } + static void genWorld(int width, int height) { genWorld(width, height, TimeUtils.millis()); } @@ -57,12 +77,13 @@ public class WorldGen { backMap[x][y] = 7; } } - for (int y = height/2; y2 && x