From: fred-boy Date: Sun, 9 Sep 2018 12:33:31 +0000 (+0700) Subject: Add more blocks X-Git-Tag: alpha0.4~94 X-Git-Url: http://deadsoftware.ru/gitweb?a=commitdiff_plain;h=a2d04a40dddc471fef220ef38b2f5e2229b9d250;p=cavedroid.git Add more blocks --- diff --git a/android/assets/terrain.png b/android/assets/terrain.png index 28bfb43..73cb45a 100644 Binary files a/android/assets/terrain.png and b/android/assets/terrain.png differ diff --git a/core/src/ru/deadsoftware/cavecraft/game/Items.java b/core/src/ru/deadsoftware/cavecraft/game/Items.java index 6d49b5d..ca0c949 100644 --- a/core/src/ru/deadsoftware/cavecraft/game/Items.java +++ b/core/src/ru/deadsoftware/cavecraft/game/Items.java @@ -57,6 +57,17 @@ public class Items { BLOCKS.put("wool_green", new Block(45,true,false,false)); BLOCKS.put("wool_red", new Block(46,true,false,false)); BLOCKS.put("wool_black", new Block(47,true,false,false)); + BLOCKS.put("gold_block", new Block(48)); + BLOCKS.put("iron_block", new Block(49)); + BLOCKS.put("stone_slab", new Block(0, 8, 16,8, 50, true, false, true)); + BLOCKS.put("double_stone_slab", new Block(51)); + BLOCKS.put("sandstone_slab", new Block(0, 8, 16,8, 52, true, false, true)); + BLOCKS.put("wooden_slab", new Block(0, 8, 16,8, 53, true, false, true)); + BLOCKS.put("cobblestone_slab", new Block(0, 8, 16,8, 54, true, false, true)); + BLOCKS.put("brick_slab", new Block(0, 8, 16,8, 55, true, false, true)); + BLOCKS.put("stonebrick", new Block(56)); + BLOCKS.put("stone_brick_slab", new Block(0, 8, 16,8, 57, true, false, true)); + BLOCKS.put("cactus", new Block(1, 0, 14, 16, 58, true, false, true)); } public static void load() { diff --git a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java b/core/src/ru/deadsoftware/cavecraft/misc/Assets.java index 87e04af..23d3ea3 100644 --- a/core/src/ru/deadsoftware/cavecraft/misc/Assets.java +++ b/core/src/ru/deadsoftware/cavecraft/misc/Assets.java @@ -10,7 +10,7 @@ import ru.deadsoftware.cavecraft.CaveGame; public class Assets { - public static final int BLOCK_TEXTURES = 48; + public static final int BLOCK_TEXTURES = 59; private static GlyphLayout layout;