X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;ds=sidebyside;f=android%2Fassets%2Fjson%2Fgame_items.json;h=042f0c9bbea1a77cde66481caaf6ec8fde516cc2;hb=919c74edce6bafc2dc7364e2c898e44f9b6c9ae3;hp=12cad8219a45487c569b89ac9d74ba40e342fb3b;hpb=59d07dd8a43cfb159045e6313cca4d519f67a6fc;p=cavedroid.git

diff --git a/android/assets/json/game_items.json b/android/assets/json/game_items.json
index 12cad82..042f0c9 100644
--- a/android/assets/json/game_items.json
+++ b/android/assets/json/game_items.json
@@ -18,10 +18,10 @@
     "cobblestone": {
       "hp": 600
     },
-    "planks": {
+    "planks_oak": {
       "hp": 180
     },
-    "sapling": {
+    "sapling_oak": {
       "hp": 0,
       "collision": false,
       "background": false,
@@ -37,14 +37,20 @@
       "background": false,
       "transparent": true,
       "fluid": true,
-      "meta": "water"
+      "texture": "water_still",
+      "meta": "water",
+      "animated": true,
+      "frames": 16
     },
     "lava": {
       "hp": -1,
       "collision": false,
       "background": false,
       "fluid": true,
-      "meta": "lava"
+      "texture": "lava_still",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16
     },
     "sand": {
       "hp": 45
@@ -62,11 +68,12 @@
       "hp": 900,
       "drop": "coal"
     },
-    "log": {
+    "log_oak": {
       "hp": 180
     },
-    "leaves": {
-      "hp": 21
+    "leaves_oak": {
+      "hp": 21,
+      "transparent": true
     },
     "sponge": {
       "hp": 54
@@ -155,52 +162,52 @@
       "transparent": true,
       "block_required": true
     },
-    "wool": {
+    "wool_colored_white": {
       "hp": 75
     },
-    "wool_orange": {
+    "wool_colored_orange": {
       "hp": 75
     },
-    "wool_magenta": {
+    "wool_colored_magenta": {
       "hp": 75
     },
-    "wool_lightblue": {
+    "wool_colored_light_blue": {
       "hp": 75
     },
-    "wool_yellow": {
+    "wool_colored_yellow": {
       "hp": 75
     },
-    "wool_lime": {
+    "wool_colored_lime": {
       "hp": 75
     },
-    "wool_pink": {
+    "wool_colored_pink": {
       "hp": 75
     },
-    "wool_gray": {
+    "wool_colored_gray": {
       "hp": 75
     },
-    "wool_lightgray": {
+    "wool_colored_silver": {
       "hp": 75
     },
-    "wool_cyan": {
+    "wool_colored_cyan": {
       "hp": 75
     },
-    "wool_purple": {
+    "wool_colored_purple": {
       "hp": 75
     },
-    "wool_blue": {
+    "wool_colored_blue": {
       "hp": 75
     },
-    "wool_brown": {
+    "wool_colored_brown": {
       "hp": 75
     },
-    "wool_green": {
+    "wool_colored_green": {
       "hp": 75
     },
-    "wool_red": {
+    "wool_colored_red": {
       "hp": 75
     },
-    "wool_black": {
+    "wool_colored_black": {
       "hp": 75
     },
     "gold_block": {
@@ -212,31 +219,37 @@
     "stone_slab": {
       "top": 8,
       "hp": 600,
-      "transparent": true
+      "transparent": true,
+      "sprite_top": 8
     },
     "double_stone_slab": {
       "hp": 600,
-      "drop": "stone_slab"
+      "drop": "stone_slab",
+      "texture": "stone_slab"
     },
     "sandstone_slab": {
       "top": 8,
       "hp": 600,
-      "transparent": true
+      "transparent": true,
+      "texture": "sandstone"
     },
-    "wooden_slab": {
+    "oak_slab": {
       "top": 8,
       "hp": 180,
-      "transparent": true
+      "transparent": true,
+      "texture": "planks_oak"
     },
     "cobblestone_slab": {
       "top": 8,
       "hp": 600,
-      "transparent": true
+      "transparent": true,
+      "texture": "cobblestone"
     },
     "brick_slab": {
       "top": 8,
       "hp": 600,
-      "transparent": true
+      "transparent": true,
+      "texture": "bricks"
     },
     "stonebrick": {
       "hp": 450
@@ -244,7 +257,8 @@
     "stonebrick_slab": {
       "top": 8,
       "hp": 450,
-      "transparent": true
+      "transparent": true,
+      "texture": "stonebrick"
     },
     "cactus": {
       "left": 1,
@@ -258,66 +272,96 @@
       "collision": false,
       "background": false,
       "transparent": true,
-      "texture": "water",
       "fluid": true,
-      "meta": "water"
+      "texture": "water_flow",
+      "meta": "water",
+      "animated": true,
+      "frames": 16
     },
     "water_12": {
+      "top": 4,
       "hp": -1,
       "collision": false,
       "background": false,
       "transparent": true,
       "fluid": true,
-      "meta": "water"
+      "texture": "water_flow",
+      "meta": "water",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 4
     },
     "water_8": {
+      "top": 8,
       "hp": -1,
       "collision": false,
       "background": false,
       "transparent": true,
       "fluid": true,
-      "meta": "water"
+      "texture": "water_flow",
+      "meta": "water",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 8
     },
     "water_4": {
+      "top": 12,
       "hp": -1,
       "collision": false,
       "background": false,
       "transparent": true,
       "fluid": true,
-      "meta": "water"
+      "texture": "water_flow",
+      "meta": "water",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 12
     },
     "lava_16": {
       "hp": -1,
       "collision": false,
       "background": false,
-      "transparent": true,
-      "texture": "lava",
       "fluid": true,
-      "meta": "lava"
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16
     },
     "lava_12": {
+      "top": 4,
       "hp": -1,
       "collision": false,
       "background": false,
-      "transparent": true,
       "fluid": true,
-      "meta": "lava"
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 4
     },
     "lava_8": {
+      "top": 8,
       "hp": -1,
       "collision": false,
       "background": false,
-      "transparent": true,
       "fluid": true,
-      "meta": "lava"
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 8
     },
     "lava_4": {
+      "top": 12,
       "hp": -1,
       "collision": false,
       "background": false,
-      "transparent": true,
       "fluid": true,
-      "meta": "lava"
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 12
     },
     "obsidian": {
       "hp": 1500
@@ -344,12 +388,12 @@
       "name": "Cobblestone",
       "type": "block"
     },
-    "planks": {
-      "name": "Planks",
+    "planks_oak": {
+      "name": "Oak Planks",
       "type": "block"
     },
-    "sapling": {
-      "name": "Sapling",
+    "sapling_oak": {
+      "name": "Oak Sapling",
       "type": "block"
     },
     "bedrock": {
@@ -384,11 +428,11 @@
       "name": "Coal Ore",
       "type": "block"
     },
-    "log": {
+    "log_oak": {
       "name": "Wood",
       "type": "block"
     },
-    "leaves": {
+    "leaves_oak": {
       "name": "Leaves",
       "type": "block"
     },
@@ -440,67 +484,67 @@
       "name": "Mushroom",
       "type": "block"
     },
-    "wool": {
+    "wool_colored_white": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_orange": {
+    "wool_colored_orange": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_magenta": {
+    "wool_colored_magenta": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_lightblue": {
+    "wool_colored_light_blue": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_yellow": {
+    "wool_colored_yellow": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_lime": {
+    "wool_colored_lime": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_pink": {
+    "wool_colored_pink": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_gray": {
+    "wool_colored_gray": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_lightgray": {
+    "wool_colored_silver": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_cyan": {
+    "wool_colored_cyan": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_purple": {
+    "wool_colored_purple": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_blue": {
+    "wool_colored_blue": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_brown": {
+    "wool_colored_brown": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_green": {
+    "wool_colored_green": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_red": {
+    "wool_colored_red": {
       "name": "Wool",
       "type": "block"
     },
-    "wool_black": {
+    "wool_colored_black": {
       "name": "Wool",
       "type": "block"
     },
@@ -522,8 +566,8 @@
       "type": "block",
       "meta": "slab"
     },
-    "wooden_slab": {
-      "name": "Wooden Slab",
+    "oak_slab": {
+      "name": "Oak Slab",
       "type": "block",
       "meta": "slab"
     },