Merge remote-tracking branch 'origin/master' into mapgen_sanity

Conflicts:
	src/init.cpp

.gitignore

@@ -1,5 +1,7 @@
 cataclysm
 cataclysm-tiles
+chkjson
+!src/chkjson
 data/*.template
 save/
 graveyard/

Makefile

@@ -63,6 +63,7 @@ TARGET = cataclysm
 TILESTARGET = cataclysm-tiles
 W32TILESTARGET = cataclysm-tiles.exe
 W32TARGET = cataclysm.exe
+CHKJSON_BIN = chkjson
 BINDIST_DIR = bindist
 BUILD_DIR = $(CURDIR)
 SRC_DIR = src
@@ -160,6 +161,7 @@ endif
 
 # Global settings for Windows targets
 ifeq ($(TARGETSYSTEM),WINDOWS)
+  CHKJSON_BIN = chkjson.exe
   TARGET = $(W32TARGET)
   BINDIST = $(W32BINDIST)
   BINDIST_CMD = $(W32BINDIST_CMD)
@@ -332,11 +334,18 @@ $(SRC_DIR)/catalua.cpp: $(LUA_DEPENDENCIES)
 localization:
 	lang/compile_mo.sh $(LANGUAGES)
 
+$(CHKJSON_BIN): src/chkjson/chkjson.cpp src/json.cpp
+	$(CXX) -Isrc/chkjson -Isrc src/chkjson/chkjson.cpp src/json.cpp -o $(CHKJSON_BIN)
+
+json-check: $(CHKJSON_BIN)
+	./$(CHKJSON_BIN)
+
 clean: clean-tests
 	rm -rf $(TARGET) $(TILESTARGET) $(W32TILESTARGET) $(W32TARGET)
 	rm -rf $(ODIR) $(W32ODIR) $(W32ODIRTILES)
 	rm -rf $(BINDIST) $(W32BINDIST) $(BINDIST_DIR)
 	rm -f $(SRC_DIR)/version.h $(LUA_DIR)/catabindings.cpp
+	rm -f $(CHKJSON_BIN)
 
 distclean:
 	rm -rf $(BINDIST_DIR)

data/json/construction.json

@@ -65,7 +65,13 @@
         "difficulty" : 0,
         "time" : 10,
         "tools" : [
-            [ "ax", "primitive_axe", "chainsaw_on" ]
+            [
+                "ax",
+                "primitive_axe",
+                "battleaxe",
+                "chainsaw_on",
+                "combatsaw_on"
+            ]
         ],
         "pre_terrain" : "t_tree",
         "post_terrain" : "t_dirt",
@@ -76,7 +82,13 @@
         "difficulty" : 0,
         "time" : 20,
         "tools" : [
-            [ "ax", "primitive_axe", "chainsaw_on" ]
+            [
+                "ax",
+                "primitive_axe",
+                "battleaxe",
+                "chainsaw_on",
+                "combatsaw_on"
+            ]
         ],
         "pre_terrain" : "t_trunk",
         "post_terrain" : "t_dirt",
@@ -87,7 +99,7 @@
         "difficulty" : 0,
         "time" : 23,
         "tools" : [
-            [ "ax", "primitive_axe", "chainsaw_on", "saw" ]
+            [ "ax", "primitive_axe", "chainsaw_on", "saw", "battleaxe" ]
         ],
         "pre_terrain" : "t_trunk",
         "post_terrain" : "t_dirt",
@@ -328,7 +340,7 @@
         "time" : 5,
         "tools" : [
             [ "hammer", "primitive_hammer", "rock", "hatchet",
-              "shovel", "e_tool", "primitive_shovel", "ax", "primitive_axe" ]
+              "shovel", "e_tool", "primitive_shovel", "ax", "primitive_axe", "battleaxe" ]
         ],
         "components" : [
             [ [ "pointy_stick", 2 ], [ "spear_wood", 2 ] ]
@@ -583,7 +595,7 @@
             [ "hammer", "primitive_hammer", "hatchet", "nailgun" ]
         ],
         "components" : [
-            [ [ "2x4", 4 ] ],
+            [ [ "2x4", 6 ] ],
             [ [ "nail", 8 ] ]
         ],
         "pre_special" : "check_empty",
@@ -597,7 +609,7 @@
             [ "hammer", "primitive_hammer", "hatchet", "nailgun" ]
         ],
         "components" : [
-            [ [ "2x4", 2 ] ],
+            [ [ "2x4", 4 ] ],
             [ [ "nail", 8 ] ]
         ],
         "pre_special" : "check_empty",