X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fassets%2Fjson%2Fgame_items.json;h=042f0c9bbea1a77cde66481caaf6ec8fde516cc2;hb=1283d7f8237177e4a83601b008d5176415ca7bed;hp=b3394e69c4632f1ceed6e93d6a284e9cbf678248;hpb=54a88705173318086a785a7fd02f1197ac93a966;p=cavedroid.git

diff --git a/android/assets/json/game_items.json b/android/assets/json/game_items.json
index b3394e6..042f0c9 100644
--- a/android/assets/json/game_items.json
+++ b/android/assets/json/game_items.json
@@ -37,17 +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,
-      "animated": true,
-      "frames": 16,
       "texture": "lava_still",
-      "meta": "lava"
+      "meta": "lava",
+      "animated": true,
+      "frames": 16
     },
     "sand": {
       "hp": 45
@@ -68,8 +71,9 @@
     "log_oak": {
       "hp": 180
     },
-    "leaves": {
-      "hp": 21
+    "leaves_oak": {
+      "hp": 21,
+      "transparent": true
     },
     "sponge": {
       "hp": 54
@@ -215,7 +219,8 @@
     "stone_slab": {
       "top": 8,
       "hp": 600,
-      "transparent": true
+      "transparent": true,
+      "sprite_top": 8
     },
     "double_stone_slab": {
       "hp": 600,
@@ -267,33 +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,
+      "fluid": true,
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16
+    },
+    "lava_12": {
+      "top": 4,
+      "hp": -1,
+      "collision": false,
+      "background": false,
+      "fluid": true,
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 4
+    },
+    "lava_8": {
+      "top": 8,
+      "hp": -1,
+      "collision": false,
+      "background": false,
+      "fluid": true,
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 8
+    },
+    "lava_4": {
+      "top": 12,
+      "hp": -1,
+      "collision": false,
+      "background": false,
+      "fluid": true,
+      "texture": "lava_flow",
+      "meta": "lava",
+      "animated": true,
+      "frames": 16,
+      "sprite_top": 12
     },
     "obsidian": {
       "hp": 1500
@@ -364,7 +432,7 @@
       "name": "Wood",
       "type": "block"
     },
-    "leaves": {
+    "leaves_oak": {
       "name": "Leaves",
       "type": "block"
     },