Merge pull request #6 from CleverRaven/master

Update #6

Makefile

@@ -322,6 +322,7 @@ WARNINGS += -Wimplicit-fallthrough=0
 endif
 
 CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
+TOOL_CXXFLAGS = -DCATA_IN_TOOL
 
 BINDIST_EXTRAS += README.md data doc
 BINDIST    = $(BUILD_PREFIX)cataclysmdda-$(VERSION).tar.gz
@@ -801,7 +802,7 @@ localization:
 	lang/compile_mo.sh $(LANGUAGES)
 
 $(CHKJSON_BIN): $(CHKJSON_SOURCES)
-	$(CXX) $(CXXFLAGS) -Isrc/chkjson -Isrc $(CHKJSON_SOURCES) -o $(CHKJSON_BIN)
+	$(CXX) $(CXXFLAGS) $(TOOL_CXXFLAGS) -Isrc/chkjson -Isrc $(CHKJSON_SOURCES) -o $(CHKJSON_BIN)
 
 json-check: $(CHKJSON_BIN)
 	./$(CHKJSON_BIN)
@@ -1040,7 +1041,8 @@ style-all-json: json_formatter
 	find data -name "*.json" -print0 | xargs -0 -L 1 $(JSON_FORMATTER_BIN)
 
 json_formatter: $(JSON_FORMATTER_SOURCES)
-	$(CXX) $(CXXFLAGS) -Itools/format -Isrc $(JSON_FORMATTER_SOURCES) -o $(JSON_FORMATTER_BIN)
+	$(CXX) $(CXXFLAGS) $(TOOL_CXXFLAGS) -Itools/format -Isrc \
+	  $(JSON_FORMATTER_SOURCES) -o $(JSON_FORMATTER_BIN)
 
 tests: version $(BUILD_PREFIX)cataclysm.a
 	$(MAKE) -C tests

data/json/dreams.json

@@ -572,6 +572,13 @@
     "type": "dream",
     "messages": [
       "You dream of bees fighting over your sweet nectar.  Mmm.",
+      "How grand it would be to sink your roots deep into the soil as the seasons pass you by.",
+      "You dream of a gigantic knot of roots, beating like a heart.",
+      "You have a disturbing dream of termites chewing all over your body.",
+      "You dream of sharing your roots with a vast forest, all plants provided for as the canopy grows ever upwards.",
+      "A family of caterpillars munches away at your leaves.",
+      "Fire rages around you, licking at your bark and engulfing the saplings and bushes near your roots.  The once chatty forest is quiet in its wake.",
+      "You dream of communing with an ancient pine.  Trees are the true survivors of this world, it tells you.",
       "A rather attractive triffid offers you a bouquet of ape heads.  How thoughtful!"
     ],
     "category": "PLANT",

data/json/effects.json

@@ -1789,7 +1789,7 @@
       "dodge_mod": [ 0.0104 ],
       "speed_mod": [ 0.1042 ],
       "bash_mod": [ 0.08333 ],
-      "growth_mod": [ 0.00625 ]
+      "size_mod": [ 0.00625 ]
     },
     "int_decay_step": 0
   },

data/json/furniture_and_terrain/furniture-flora.json

@@ -6,6 +6,7 @@
     "description": "These strange flowers have appeared in the wake of the Cataclysm, and their buds can be used for medicinal purposes, like the seeds of the mundane poppy they're named after.  The dirt around them gently churns as their roots writhe beneath the soil, and it's surrounded by an overwhelming floral smell that makes you feel sleepy.",
     "symbol": "f",
     "color": "light_red",
+    "looks_like": "f_dandelion",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
@@ -33,6 +34,7 @@
     "description": "Ahh, soothing chamomile tea.",
     "symbol": "f",
     "color": "white",
+    "looks_like": "f_dandelion",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
@@ -197,6 +199,7 @@
     "id": "f_bluebell",
     "name": "bluebell",
     "description": "A common bluebell flower.  Pretty.",
+    "looks_like": "f_dandelion",
     "symbol": "f",
     "color": "blue",
     "move_cost_mod": 0,
@@ -218,6 +221,7 @@
     "description": "A puffy flower with many tightly layered petals.",
     "symbol": "f",
     "color": "magenta",
+    "looks_like": "f_dandelion",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
@@ -231,6 +235,7 @@
     "description": "A blue flower imported from Europe, also known as a Cornflower.",
     "symbol": "f",
     "color": "cyan",
+    "looks_like": "f_dandelion",
     "move_cost_mod": 0,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "FLOWER" ],
@@ -245,6 +250,7 @@
     "description": "A pretty moonflower.",
     "symbol": "*",
     "color": "light_green",
+    "looks_like": "f_dandelion",
     "move_cost_mod": 1,
     "required_str": -1,
     "flags": [ "TRANSPARENT", "TINY", "FLAMMABLE_ASH", "NOCOLLIDE", "ORGANIC" ],
@@ -264,6 +270,7 @@
     "symbol": "#",
     "description": "A sizable pile of leaves.  You could sleep on it if you don't care about comfort or warmth.",
     "color": "brown",
+    "looks_like": "t_dirtpile",
     "move_cost_mod": 3,
     "coverage": 35,
     "comfort": 1,

data/json/furniture_and_terrain/furniture-medical.json

@@ -92,7 +92,6 @@
     "coverage": 60,
     "required_str": 16,
     "max_volume": 4000,
-    "insulation": 2,
     "looks_like": "f_washer",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF" ],
     "deconstruct": {
@@ -138,7 +137,6 @@
     "coverage": 60,
     "required_str": 16,
     "max_volume": 4000,
-    "insulation": 2,
     "looks_like": "f_washer",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR", "FLAT_SURF", "SEALED" ],
     "deconstruct": {
@@ -183,7 +181,6 @@
     "coverage": 80,
     "required_str": 18,
     "max_volume": 7000,
-    "insulation": 6,
     "looks_like": "f_fridge",
     "flags": [ "CONTAINER", "PLACE_ITEM", "BLOCKSDOOR" ],
     "deconstruct": {