Store block references intead of ids

[cavedroid.git] / android / assets / json / game_items.json

diff --git a/android/assets/json/game_items.json b/android/assets/json/game_items.json
index 48b612fa88543a925313c8310f3a5290cd41408e..279e13fb5fd262d440178fbd0c23fce60b1abfd5 100644 (file)
--- a/android/assets/json/game_items.json
+++ b/android/assets/json/game_items.json
@@ -123,7 +123,7 @@
     "lava": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 0,
       "frames": 16,
       "hp": -1,
       "id": 9,
@@ -133,7 +133,7 @@
     "lava_12": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 2,
       "frames": 16,
       "hp": -1,
       "id": 65,
@@ -145,7 +145,7 @@
     "lava_16": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 1,
       "frames": 16,
       "hp": -1,
       "id": 64,
@@ -155,7 +155,7 @@
     "lava_4": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 4,
       "frames": 16,
       "hp": -1,
       "id": 67,
@@ -167,7 +167,7 @@
     "lava_8": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 3,
       "frames": 16,
       "hp": -1,
       "id": 66,
@@ -295,7 +295,7 @@
     "water": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 0,
       "frames": 16,
       "hp": -1,
       "id": 8,
@@ -306,7 +306,7 @@
     "water_12": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 2,
       "frames": 16,
       "hp": -1,
       "id": 61,
@@ -319,7 +319,7 @@
     "water_16": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 1,
       "frames": 16,
       "hp": -1,
       "id": 60,
@@ -330,7 +330,7 @@
     "water_4": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 4,
       "frames": 16,
       "hp": -1,
       "id": 63,
@@ -343,7 +343,7 @@
     "water_8": {
       "animated": true,
       "collision": false,
-      "fluid": true,
+      "state": 3,
       "frames": 16,
       "hp": -1,
       "id": 62,
@@ -444,7 +444,8 @@
       "id": 66,
       "name": "Empty Bucket",
       "origin_x": 0.25,
-      "type": "bucket"
+      "type": "bucket",
+      "action_key": "use_empty_bucket"
     },
     "bucket_lava": {
       "id": 68,
@@ -496,13 +497,13 @@
       "id": 64,
       "name": "Diamond Shovel",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "shovel"
     },
     "diamond_sword": {
       "id": 59,
       "name": "Diamond Sword",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "sword"
     },
     "dirt": {
       "id": 3,
@@ -528,13 +529,13 @@
       "id": 65,
       "name": "Golden Shovel",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "shovel"
     },
     "gold_sword": {
       "id": 60,
       "name": "Golden Sword",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "sword"
     },
     "grass": {
       "id": 2,
@@ -560,13 +561,13 @@
       "id": 63,
       "name": "Iron Shovel",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "shovel"
     },
     "iron_sword": {
       "id": 58,
       "name": "Iron Sword",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "sword"
     },
     "lapis_block": {
       "id": 19,
@@ -660,7 +661,7 @@
       "id": 62,
       "name": "Stone Shovel",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "shovel"
     },
     "stone_slab": {
       "id": 47,
@@ -671,7 +672,7 @@
       "id": 57,
       "name": "Stone Sword",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "sword"
     },
     "stonebrick": {
       "id": 52,
@@ -703,13 +704,13 @@
       "id": 61,
       "name": "Wooden Shovel",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "shovel"
     },
     "wood_sword": {
       "id": 56,
       "name": "Wooden Sword",
       "origin_x": 0.125,
-      "type": "tool"
+      "type": "sword"
     },
     "wool_colored_black": {
       "id": 44,