X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=android%2Fassets%2Fjson%2Fgame_items.json;h=6db046714ee2056a90bfddb8210dc5b6f08e6750;hb=f34df6e5eb1052467333f1461c67e75b21eb0d95;hp=47636290ece1d3ead25ea3fbecd12054c739134e;hpb=a21a93fd9fa33adebe52d1f4478866dcc3b66d96;p=cavedroid.git

diff --git a/android/assets/json/game_items.json b/android/assets/json/game_items.json
index 4763629..6db0467 100644
--- a/android/assets/json/game_items.json
+++ b/android/assets/json/game_items.json
@@ -21,6 +21,13 @@
       "tool_level": 0,
       "tool_type": "shovel"
     },
+    "grass_snowed": {
+      "hp": 54,
+      "drop": "dirt",
+      "texture": "grass_snowed",
+      "tool_level": 0,
+      "tool_type": "shovel"
+    },
     "dirt": {
       "hp": 45,
       "drop": "dirt",
@@ -48,7 +55,7 @@
       "block_required": true,
       "drop": "sapling_oak",
       "texture": "sapling_oak",
-      "hp": 1
+      "hp": 0
     },
     "bedrock": {
       "drop": "bedrock",
@@ -71,7 +78,8 @@
       "texture": "lava_still",
       "animated": true,
       "frames": 16,
-      "state": 0
+      "state": 0,
+      "damage": 4
     },
     "sand": {
       "hp": 45,
@@ -108,6 +116,20 @@
       "tool_level": 1,
       "tool_type": "pickaxe"
     },
+    "diamond_ore": {
+      "hp": 900,
+      "drop": "diamond",
+      "texture": "diamond_ore",
+      "tool_level": 3,
+      "tool_type": "pickaxe"
+    },
+    "diamond_block": {
+      "hp": 1500,
+      "drop": "diamond_block",
+      "texture": "diamond_block",
+      "tool_level": 3,
+      "tool_type": "pickaxe"
+    },
     "log_oak": {
       "hp": 180,
       "drop": "log_oak",
@@ -117,11 +139,11 @@
     },
     "leaves_oak": {
       "hp": 21,
-      "transparent": true,
       "drop": "leaves_oak",
       "texture": "leaves_oak",
       "tool_level": 1,
-      "tool_type": "shears"
+      "tool_type": "shears",
+      "tint": "#5AC557"
     },
     "sponge": {
       "hp": 54,
@@ -200,7 +222,9 @@
       "drop": "tallgrass",
       "texture": "tallgrass",
       "tool_level": 1,
-      "tool_type": "shears"
+      "tool_type": "shears",
+      "tint": "#5AC557",
+      "hp": 0
     },
     "deadbush": {
       "collision": false,
@@ -209,7 +233,8 @@
       "drop": "deadbush",
       "texture": "deadbush",
       "tool_level": 1,
-      "tool_type": "shears"
+      "tool_type": "shears",
+      "hp": 0
     },
     "bricks": {
       "hp": 600,
@@ -223,28 +248,32 @@
       "transparent": true,
       "block_required": true,
       "drop": "dandelion",
-      "texture": "dandelion"
+      "texture": "dandelion",
+      "hp": 0
     },
     "rose": {
       "collision": false,
       "transparent": true,
       "block_required": true,
       "drop": "rose",
-      "texture": "rose"
+      "texture": "rose",
+      "hp": 0
     },
     "mushroom_brown": {
       "collision": false,
       "transparent": true,
       "block_required": true,
       "drop": "mushroom_brown",
-      "texture": "mushroom_brown"
+      "texture": "mushroom_brown",
+      "hp": 0
     },
     "mushroom_red": {
       "collision": false,
       "transparent": true,
       "block_required": true,
       "drop": "mushroom_red",
-      "texture": "mushroom_red"
+      "texture": "mushroom_red",
+      "hp": 0
     },
     "wool_colored_white": {
       "hp": 75,
@@ -550,7 +579,8 @@
       "transparent": true,
       "block_required": true,
       "drop": "cactus",
-      "texture": "cactus"
+      "texture": "cactus",
+      "damage": 1
     },
     "water_16": {
       "collision": false,
@@ -605,43 +635,50 @@
       "texture": "lava_flow",
       "animated": true,
       "frames": 16,
-      "state": 1
+      "state": 1,
+      "damage": 4
     },
     "lava_12": {
       "top": 4,
       "sprite_top": 4,
       "collision": false,
+      "transparent": true,
       "drop": "lava_12",
       "meta": "lava",
       "texture": "lava_flow",
       "animated": true,
       "frames": 16,
-      "state": 2
+      "state": 2,
+      "damage": 4
     },
     "lava_8": {
       "top": 8,
       "sprite_top": 8,
       "collision": false,
+      "transparent": true,
       "drop": "lava_8",
       "meta": "lava",
       "texture": "lava_flow",
       "animated": true,
       "frames": 16,
-      "state": 3
+      "state": 3,
+      "damage": 4
     },
     "lava_4": {
       "top": 12,
       "sprite_top": 12,
       "collision": false,
+      "transparent": true,
       "drop": "lava_4",
       "meta": "lava",
       "texture": "lava_flow",
       "animated": true,
       "frames": 16,
-      "state": 4
+      "state": 4,
+      "damage": 4
     },
     "obsidian": {
-      "hp": 1500,
+      "hp": 15000,
       "drop": "obsidian",
       "texture": "obsidian",
       "tool_level": 4,
@@ -724,6 +761,11 @@
       "type": "block",
       "texture": "coal_ore"
     },
+    "diamond_ore": {
+      "name": "Diamond Ore",
+      "type": "block",
+      "texture": "diamond_ore"
+    },
     "log_oak": {
       "name": "Wood",
       "type": "block",
@@ -890,6 +932,11 @@
       "type": "block",
       "texture": "iron_block"
     },
+    "diamond_block": {
+      "name": "Diamond Block",
+      "type": "block",
+      "texture": "diamond_block"
+    },
     "stone_slab": {
       "name": "Stone Slab",
       "type": "slab",
@@ -952,63 +999,72 @@
       "type": "sword",
       "texture": "wood_sword",
       "origin_x": 0.125,
-      "tool_level": 1
+      "tool_level": 1,
+      "max_stack": 60
     },
     "stone_sword": {
       "name": "Stone Sword",
       "type": "sword",
       "texture": "stone_sword",
       "origin_x": 0.125,
-      "tool_level": 2
+      "tool_level": 2,
+      "max_stack": 132
     },
     "iron_sword": {
       "name": "Iron Sword",
       "type": "sword",
       "texture": "iron_sword",
       "origin_x": 0.125,
-      "tool_level": 3
+      "tool_level": 3,
+      "max_stack": 251
     },
     "diamond_sword": {
       "name": "Diamond Sword",
       "type": "sword",
       "texture": "diamond_sword",
       "origin_x": 0.125,
-      "tool_level": 4
+      "tool_level": 4,
+      "max_stack": 1562
     },
     "gold_sword": {
       "name": "Golden Sword",
       "type": "sword",
       "texture": "gold_sword",
       "origin_x": 0.125,
-      "tool_level": 1
+      "tool_level": 1,
+      "max_stack": 33
     },
     "wood_shovel": {
       "name": "Wooden Shovel",
       "type": "shovel",
       "texture": "wood_shovel",
       "origin_x": 0.125,
-      "tool_level" : 1
+      "tool_level" : 1,
+      "max_stack": 59
     },
     "stone_shovel": {
       "name": "Stone Shovel",
       "type": "shovel",
       "texture": "stone_shovel",
       "origin_x": 0.125,
-      "tool_level" : 2
+      "tool_level" : 2,
+      "max_stack": 131
     },
     "iron_shovel": {
       "name": "Iron Shovel",
       "type": "shovel",
       "texture": "iron_shovel",
       "origin_x": 0.125,
-      "tool_level" : 3
+      "tool_level" : 3,
+      "max_stack": 250
     },
     "diamond_shovel": {
       "name": "Diamond Shovel",
       "type": "shovel",
       "texture": "diamond_shovel",
       "origin_x": 0.125,
-      "tool_level" : 4
+      "tool_level" : 4,
+      "max_stack": 1561
     },
     "gold_shovel": {
       "name": "Golden Shovel",
@@ -1016,35 +1072,40 @@
       "texture": "gold_shovel",
       "origin_x": 0.125,
       "tool_level" : 1,
-      "block_damage_multiplier": 6
+      "block_damage_multiplier": 6,
+      "max_stack": 32
     },
     "wood_pickaxe": {
       "name": "Wooden Pickaxe",
       "type": "pickaxe",
       "texture": "wood_pickaxe",
       "origin_x": 0.125,
-      "tool_level" : 1
+      "tool_level" : 1,
+      "max_stack": 59
     },
     "stone_pickaxe": {
       "name": "Stone Pickaxe",
       "type": "pickaxe",
       "texture": "stone_pickaxe",
       "origin_x": 0.125,
-      "tool_level" : 2
+      "tool_level" : 2,
+      "max_stack": 131
     },
     "iron_pickaxe": {
       "name": "Iron Pickaxe",
       "type": "pickaxe",
       "texture": "iron_pickaxe",
       "origin_x": 0.125,
-      "tool_level" : 3
+      "tool_level" : 3,
+      "max_stack": 251
     },
     "diamond_pickaxe": {
       "name": "Diamond Pickaxe",
       "type": "pickaxe",
       "texture": "diamond_pickaxe",
       "origin_x": 0.125,
-      "tool_level" : 4
+      "tool_level" : 4,
+      "max_stack": 1562
     },
     "gold_pickaxe": {
       "name": "Golden Pickaxe",
@@ -1052,35 +1113,40 @@
       "texture": "gold_pickaxe",
       "origin_x": 0.125,
       "tool_level" : 1,
-      "block_damage_multiplier": 6
+      "block_damage_multiplier": 6,
+      "max_stack": 33
     },
     "wood_axe": {
       "name": "Wooden Axe",
       "type": "axe",
       "texture": "wood_axe",
       "origin_x": 0.125,
-      "tool_level" : 1
+      "tool_level" : 1,
+      "max_stack": 60
     },
     "stone_axe": {
       "name": "Stone Axe",
       "type": "axe",
       "texture": "stone_axe",
       "origin_x": 0.125,
-      "tool_level" : 2
+      "tool_level" : 2,
+      "max_stack": 131
     },
     "iron_axe": {
       "name": "Iron Axe",
       "type": "axe",
       "texture": "iron_axe",
       "origin_x": 0.125,
-      "tool_level" : 3
+      "tool_level" : 3,
+      "max_stack": 250
     },
     "diamond_axe": {
       "name": "Diamond Axe",
       "type": "axe",
       "texture": "diamond_axe",
       "origin_x": 0.125,
-      "tool_level" : 4
+      "tool_level" : 4,
+      "max_stack": 1561
     },
     "gold_axe": {
       "name": "Golden Axe",
@@ -1088,35 +1154,40 @@
       "texture": "gold_axe",
       "origin_x": 0.125,
       "tool_level" : 1,
-      "block_damage_multiplier": 6
+      "block_damage_multiplier": 6,
+      "max_stack": 32
     },
     "shears": {
       "name": "Shears",
       "type": "shears",
       "texture": "shears",
       "tool_level" : 1,
-      "origin_x": 0.125
+      "origin_x": 0.125,
+      "max_stack": 238
     },
     "bucket_empty": {
       "name": "Empty Bucket",
       "type": "bucket",
       "texture": "bucket_empty",
       "origin_x": 0.25,
-      "action_key": "use_empty_bucket"
+      "action_key": "use_empty_bucket",
+      "max_stack": 1
     },
     "bucket_water": {
       "name": "Water Bucket",
       "type": "bucket",
       "texture": "bucket_water",
       "origin_x": 0.25,
-      "action_key": "use_water_bucket"
+      "action_key": "use_water_bucket",
+      "max_stack": 1
     },
     "bucket_lava": {
       "name": "Lava Bucket",
       "type": "bucket",
       "texture": "bucket_lava",
       "origin_x": 0.25,
-      "action_key": "use_lava_bucket"
+      "action_key": "use_lava_bucket",
+      "max_stack": 1
     }
   }
 }