X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2Fassets%2Fjson%2Fcrafting.json;h=6404dd6d6b7bb79acd57c977f2d4c5cde1c537fd;hb=4f339b3a792cf0b066acc9e630090d6a1389df0b;hp=6f651bb297f24b0acc6e0ad41637051d6a170a19;hpb=387ad284ceb79b07cba3726fa7350b7e83916815;p=cavedroid.git

diff --git a/android/assets/json/crafting.json b/android/assets/json/crafting.json
index 6f651bb..6404dd6 100644
--- a/android/assets/json/crafting.json
+++ b/android/assets/json/crafting.json
@@ -3,24 +3,28 @@
     "input": ["log_oak", "none", "none", "none", "none", "none", "none", "none", "none"],
     "count": 4
   },
+  "planks_spruce": {
+    "input": ["log_spruce", "none", "none", "none", "none", "none", "none", "none", "none"],
+    "count": 4
+  },
   "stick": {
-    "input": ["planks_oak", "none", "none", "planks_oak", "none", "none", "none", "none", "none"],
+    "input": ["planks.*", "none", "none", "planks.*", "none", "none", "none", "none", "none"],
     "count": 4
   },
   "wood_pickaxe": {
-    "input": ["planks_oak", "planks_oak", "planks_oak", "none", "stick", "none", "none", "stick", "none"],
+    "input": ["planks.*", "planks.*", "planks.*", "none", "stick", "none", "none", "stick", "none"],
     "count": 59
   },
   "wood_axe": {
-    "input": ["planks_oak", "planks_oak", "none", "planks_oak", "stick", "none", "none", "stick", "none"],
+    "input": ["planks.*", "planks.*", "none", "planks.*", "stick", "none", "none", "stick", "none"],
     "count": 60
   },
   "wood_sword": {
-    "input": ["none", "planks_oak", "none", "none", "planks_oak", "none", "none", "stick", "none"],
+    "input": ["planks.*", "none", "none", "planks.*", "none", "none", "stick", "none", "none"],
     "count": 60
   },
   "wood_shovel": {
-    "input": ["none", "planks_oak", "none", "none", "stick", "none", "none", "stick", "none"],
+    "input": ["planks.*", "none", "none", "stick", "none", "none", "stick", "none", "none"],
     "count": 59
   },
   "stone_pickaxe": {
@@ -32,11 +36,72 @@
     "count": 131
   },
   "stone_sword": {
-    "input": ["none", "cobblestone", "none", "none", "cobblestone", "none", "none", "stick", "none"],
+    "input": ["cobblestone", "none", "none", "cobblestone", "none", "none", "stick", "none", "none"],
     "count": 132
   },
   "stone_shovel": {
-    "input": ["none", "cobblestone", "none", "none", "stick", "none", "none", "stick", "none"],
+    "input": ["cobblestone", "none", "none", "stick", "none", "none", "stick", "none", "none"],
     "count": 131
+  },
+  "iron_pickaxe": {
+    "input": ["iron_ingot", "iron_ingot", "iron_ingot", "none", "stick", "none", "none", "stick", "none"],
+    "count": 251
+  },
+  "iron_axe": {
+    "input": ["iron_ingot", "iron_ingot", "none", "iron_ingot", "stick", "none", "none", "stick", "none"],
+    "count": 250
+  },
+  "iron_sword": {
+    "input": ["iron_ingot", "none", "none", "iron_ingot", "none", "none", "stick", "none", "none"],
+    "count": 251
+  },
+  "iron_shovel": {
+    "input": ["iron_ingot", "none", "none", "stick", "none", "none", "stick", "none", "none"],
+    "count": 250
+  },
+  "gold_pickaxe": {
+    "input": ["gold_ingot", "gold_ingot", "gold_ingot", "none", "stick", "none", "none", "stick", "none"],
+    "count": 33
+  },
+  "gold_axe": {
+    "input": ["gold_ingot", "gold_ingot", "none", "gold_ingot", "stick", "none", "none", "stick", "none"],
+    "count": 32
+  },
+  "gold_sword": {
+    "input": ["gold_ingot", "none", "none", "gold_ingot", "none", "none", "stick", "none", "none"],
+    "count": 33
+  },
+  "gold_shovel": {
+    "input": ["gold_ingot", "none", "none", "stick", "none", "none", "stick", "none", "none"],
+    "count": 32
+  },
+  "diamond_pickaxe": {
+    "input": ["diamond", "diamond", "diamond", "none", "stick", "none", "none", "stick", "none"],
+    "count": 1562
+  },
+  "diamond_axe": {
+    "input": ["diamond", "diamond", "none", "diamond", "stick", "none", "none", "stick", "none"],
+    "count": 1561
+  },
+  "diamond_sword": {
+    "input": ["diamond", "none", "none", "diamond", "none", "none", "stick", "none", "none"],
+    "count": 1562
+  },
+  "diamond_shovel": {
+    "input": ["diamond", "none", "none", "stick", "none", "none", "stick", "none", "none"],
+    "count": 1561
+  },
+  "snow_block": {
+    "input": ["snowball", "snowball", "none", "snowball", "snowball", "none", "none", "none", "none"],
+    "count": 1
+  },
+  "crafting_table": {
+    "input": ["planks.*", "planks.*", "none", "planks.*", "planks.*", "none", "none", "none", "none"]
+  },
+  "furnace": {
+    "input": ["cobblestone", "cobblestone", "cobblestone", "cobblestone", "none", "cobblestone", "cobblestone", "cobblestone", "cobblestone"]
+  },
+  "chest": {
+    "input": ["planks_.*", "planks_.*", "planks_.*", "planks_.*", "none", "planks_.*", "planks_.*", "planks_.*", "planks_.*"]
   }
 }
\ No newline at end of file