Merge pull request #85 from CleverRaven/master

Merge pull request CleverRaven#37839 from jbytheway/mapgen_fix_missin…

Makefile

@@ -1039,12 +1039,13 @@ endif
 
 export ODIR _OBJS LDFLAGS CXX W32FLAGS DEFINES CXXFLAGS TARGETSYSTEM
 
-ctags: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
-	ctags $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
+ctags: $(ASTYLE_SOURCES)
+	ctags $^
+	./tools/json_tools/cddatags.py
 
-etags: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
-	etags $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR)
-	find data -name "*.json" -print0 | xargs -0 -L 50 etags --append
+etags: $(ASTYLE_SOURCES)
+	etags $^
+	./tools/json_tools/cddatags.py
 
 astyle: $(ASTYLE_SOURCES)
 	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)

README.md

@@ -1,6 +1,7 @@
 [![Build Status](https://travis-ci.org/CleverRaven/Cataclysm-DDA.svg?branch=master)](https://travis-ci.org/CleverRaven/Cataclysm-DDA)
 [![Coverage Status](https://coveralls.io/repos/github/CleverRaven/Cataclysm-DDA/badge.svg?branch=master)](https://coveralls.io/github/CleverRaven/Cataclysm-DDA?branch=master)
 [![Open Source Helpers](https://www.codetriage.com/cleverraven/cataclysm-dda/badges/users.svg)](https://www.codetriage.com/cleverraven/cataclysm-dda)
+![Commit Activity](https://img.shields.io/github/commit-activity/m/CleverRaven/Cataclysm-DDA)
 [![Lines of Code](https://tokei.rs/b1/github/CleverRaven/Cataclysm-DDA?category=code)](https://github.com/XAMPPRocky/tokei)
 
 # Cataclysm: Dark Days Ahead

data/json/items/armor/arms_armor.json

@@ -26,8 +26,7 @@
     "id": "armguard_chitin",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chitin arm guards",
-    "name_plural": "pairs of chitin arm guards",
+    "name": { "str": "pair of chitin arm guards", "str_pl": "pairs of chitin arm guards" },
     "description": "A pair of arm guards made from the exoskeletons of insects.  Light and durable.",
     "weight": "392 g",
     "volume": "2500 ml",
@@ -50,8 +49,7 @@
     "copy-from": "armguard_chitin",
     "looks_like": "armguard_chitin",
     "type": "ARMOR",
-    "name": "pair of biosilicified chitin arm guards",
-    "name_plural": "pairs of biosilicified chitin arm guards",
+    "name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" },
     "description": "A pair of arm guards crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants.  Acid-resistant and very durable.",
     "material": [ "acidchitin" ],
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
@@ -219,8 +217,7 @@
     "id": "chainmail_arms",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chainmail sleeves",
-    "name_plural": "pairs of chainmail sleeves",
+    "name": { "str": "pair of chainmail sleeves", "str_pl": "pairs of chainmail sleeves" },
     "description": "Customized chainmail arms.  Each sleeve has straps to connect them with each other.  The lack of fingers makes them less cumbersome and allows them to be used with gloves.",
     "weight": "2812 g",
     "volume": "750 ml",
@@ -240,16 +237,15 @@
     "id": "elbow_pads",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of elbow pads",
-    "name_plural": "pairs of elbow pads",
+    "name": { "str": "pair of elbow pads", "str_pl": "pairs of elbow pads" },
     "description": "A pair of elbow pads made of stout plastic and cloth.",
     "weight": "110 g",
     "volume": "750 ml",
     "price": 3500,
     "to_hit": 1,
     "material": [ "plastic", "cotton" ],
     "symbol": "[",
-    "looks_like": "armguards_hard",
+    "looks_like": "armguard_hard",
     "color": "dark_gray",
     "covers": [ "ARMS" ],
     "coverage": 30,

data/json/items/armor/boots.json

@@ -2,8 +2,7 @@
   {
     "id": "bastsandals",
     "type": "ARMOR",
-    "name": "pair of cord sandals",
-    "name_plural": "pairs of cord sandals",
+    "name": { "str": "pair of cord sandals", "str_pl": "pairs of cord sandals" },
     "description": "Lightweight sandals made from wound cord.  They offer little in the way of protection, but keep you cool during warmer months.",
     "weight": "68 g",
     "volume": "250 ml",
@@ -23,8 +22,7 @@
   {
     "id": "boots",
     "type": "ARMOR",
-    "name": "pair of boots",
-    "name_plural": "pairs of boots",
+    "name": { "str": "pair of boots", "str_pl": "pairs of boots" },
     "description": "Tough leather boots.  Very durable.",
     "weight": "1060 g",
     "volume": "2500 ml",
@@ -48,8 +46,7 @@
     "id": "boots_bone",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of bone armor boots",
-    "name_plural": "pairs of bone armor boots",
+    "name": { "str": "pair of bone armor boots", "str_pl": "pairs of bone armor boots" },
     "description": "Leather boots armored with reinforcements made from bone.  Light and strong.",
     "weight": "1824 g",
     "volume": "4250 ml",
@@ -98,8 +95,7 @@
     "id": "boots_chitin",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chitinous boots",
-    "name_plural": "pairs of chitinous boots",
+    "name": { "str": "pair of chitinous boots", "str_pl": "pairs of chitinous boots" },
     "description": "Boots made from the exoskeletons of insects.  Light and durable.",
     "weight": "1620 g",
     "volume": "4250 ml",
@@ -134,8 +130,7 @@
     "repairs_like": "boots_survivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of combat boots",
-    "name_plural": "pairs of combat boots",
+    "name": { "str": "pair of combat boots", "str_pl": "pairs of combat boots" },
     "description": "Modern reinforced tactical combat boots.  Very durable.",
     "weight": "1060 g",
     "volume": "2 L",
@@ -538,8 +533,7 @@
     "id": "cleats",
     "repairs_like": "boots_larmor",
     "type": "ARMOR",
-    "name": "pair of cleats",
-    "name_plural": "pairs of cleats",
+    "name": { "str": "pair of cleats", "str_pl": "pairs of cleats" },
     "description": "Sport shoes with hard undersides, and studs on the bottom designed to dig into the grass.",
     "weight": "860 g",
     "volume": "1500 ml",
@@ -607,8 +601,7 @@
     "id": "clownshoes",
     "repairs_like": "boots",
     "type": "ARMOR",
-    "name": "pair of clown shoes",
-    "name_plural": "pairs of clown shoes",
+    "name": { "str": "pair of clown shoes", "str_pl": "pairs of clown shoes" },
     "description": "Gigantic shoes fit for a clown.  Incredibly difficult to walk in.",
     "weight": "1140 g",
     "volume": "3500 ml",
@@ -631,8 +624,7 @@
   {
     "id": "dance_shoes",
     "type": "ARMOR",
-    "name": "pair of dance shoes",
-    "name_plural": "pairs of dance shoes",
+    "name": { "str": "pair of dance shoes", "str_pl": "pairs of dance shoes" },
     "description": "Expensive black dance shoes with large heels.",
     "weight": "870 g",
     "volume": "1500 ml",
@@ -655,8 +647,7 @@
     "id": "dress_shoes",
     "repairs_like": "boots",
     "type": "ARMOR",
-    "name": "pair of dress shoes",
-    "name_plural": "pairs of dress shoes",
+    "name": { "str": "pair of dress shoes", "str_pl": "pairs of dress shoes" },
     "description": "Fancy patent leather shoes.  Not designed for running in.",
     "weight": "870 g",
     "volume": "1500 ml",
@@ -992,8 +983,7 @@
   {
     "id": "shoes_birchbark",
     "type": "ARMOR",
-    "name": "pair of birchbark shoes",
-    "name_plural": "pairs of birchbark shoes",
+    "name": { "str": "pair of birchbark shoes", "str_pl": "pairs of birchbark shoes" },
     "description": "Simple shoes woven from strips of birch bark.  Not very comfortable, but better than going barefoot.",
     "weight": "345 g",
     "volume": "500 ml",
@@ -1014,8 +1004,7 @@
     "id": "shoes_bowling",
     "repairs_like": "boots",
     "type": "ARMOR",
-    "name": "pair of bowling shoes",
-    "name_plural": "pairs of bowling shoes",
+    "name": { "str": "pair of bowling shoes", "str_pl": "pairs of bowling shoes" },
     "description": "A pair of flat-soled shoes designed to give you a grip on slippery surfaces.",
     "weight": "840 g",
     "volume": "1500 ml",
@@ -1233,8 +1222,7 @@
   {
     "id": "leg_warmers_xlf",
     "type": "ARMOR",
-    "name": "pair of fetlock furs",
-    "name_plural": "pairs of fetlock furs",
+    "name": { "str": "pair of fetlock furs", "str_pl": "pairs of fetlock furs" },
     "description": "Snug fur sleeves to keep your fetlocks warm.",
     "weight": "66 g",
     "volume": "750 ml",
@@ -1253,8 +1241,7 @@
   {
     "id": "nomex_socks",
     "type": "ARMOR",
-    "name": "pair of flame-resistant socks",
-    "name_plural": "pairs of flame-resistant socks",
+    "name": { "str": "pair of flame-resistant socks", "str_pl": "pairs of flame-resistant socks" },
     "description": "A snug fitting pair of stockings made from thin and lightweight Nomex fire-resistant fabric.  Tough yet breathable, they are light and comfortable to wear under clothing.",
     "weight": "200 g",
     "volume": "750 ml",
@@ -1311,8 +1298,7 @@
   {
     "id": "socks_bag",
     "type": "ARMOR",
-    "name": "pair of bag socks",
-    "name_plural": "pairs of bag socks",
+    "name": { "str": "pair of bag socks", "str_pl": "pairs of bag socks" },
     "description": "A pair of disposable plastic bags, adapted to be used as socks.",
     "weight": "6 g",
     "volume": "250 ml",
@@ -1331,8 +1317,7 @@
     "id": "socks_bowling",
     "repairs_like": "boots",
     "type": "ARMOR",
-    "name": "pair of disposable bowling socks",
-    "name_plural": "pairs of disposable bowling socks",
+    "name": { "str": "pair of disposable bowling socks", "str_pl": "pairs of disposable bowling socks" },
     "description": "Cheap one time socks.  Can keep your feet clean, but too thin to give any protection.",
     "weight": "20 g",
     "volume": "250 ml",

data/json/items/armor/eyewear.json

@@ -2,8 +2,7 @@
   {
     "id": "eclipse_glasses",
     "type": "ARMOR",
-    "name": "pair of eclipse glasses",
-    "name_plural": "pairs of eclipse glasses",
+    "name": { "str": "pair of eclipse glasses", "str_pl": "pairs of eclipse glasses" },
     "description": "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped with a layer of aluminum coating.  They allow safe viewing of extremely bright and harmful sources of light, like the sun during a solar eclipse.",
     "weight": "27 g",
     "volume": "250 ml",
@@ -46,8 +45,7 @@
   {
     "id": "fitover_sunglasses",
     "type": "ARMOR",
-    "name": "pair of fit-over sunglasses",
-    "name_plural": "pairs of fit-over sunglasses",
+    "name": { "str": "pair of fit-over sunglasses", "str_pl": "pairs of fit-over sunglasses" },
     "description": "A pair of fit-over sunglasses designed to be worn over a pair of corrective glasses.  Good for keeping the glare out of your eyes.",
     "weight": "45 g",
     "volume": "250 ml",
@@ -69,8 +67,7 @@
     "id": "glasses_bal",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of ballistic glasses",
-    "name_plural": "pairs of ballistic glasses",
+    "name": { "str": "pair of ballistic glasses", "str_pl": "pairs of ballistic glasses" },
     "description": "Modern tactical eyewear that protects from small projectiles and fragments.  Provides excellent protection from environmental dangers.",
     "weight": "184 g",
     "volume": "250 ml",
@@ -92,8 +89,7 @@
   {
     "id": "glasses_bifocal",
     "type": "ARMOR",
-    "name": "pair of bifocal glasses",
-    "name_plural": "pairs of bifocal glasses",
+    "name": { "str": "pair of bifocal glasses", "str_pl": "pairs of bifocal glasses" },
     "description": "A pair of bifocal glasses for those who are both near-sighted and far-sighted.  You can use them to focus sunlight.",
     "weight": "30 g",
     "volume": "250 ml",
@@ -113,8 +109,7 @@
   {
     "id": "glasses_eye",
     "type": "ARMOR",
-    "name": "pair of eyeglasses",
-    "name_plural": "pairs of eyeglasses",
+    "name": { "str": "pair of eyeglasses", "str_pl": "pairs of eyeglasses" },
     "description": "A pair of glasses for the near-sighted.  The concave lenses diffuse the sunlight, rendering them useless for starting fires.",
     "weight": "30 g",
     "volume": "250 ml",