merge master into branch to enable mission completion

.lgtm.yml

@@ -1,3 +1,4 @@
 # Disable FIXME query, in DDA it is as likely to be a future feature as a bug.
 queries:
     - exclude: cpp/fixme-comment
+    - exclude: cpp/non-constant-format

Makefile

@@ -1149,8 +1149,10 @@ etags: $(ASTYLE_SOURCES)
 	etags $^
 	./tools/json_tools/cddatags.py
 
-astyle: $(ASTYLE_SOURCES)
-	$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
+ASTYLE_CHECK_STAMPS = $(sort $(patsubst %,$(ODIR)/%.astyle-check-stamp,$(ASTYLE_SOURCES)))
+astyle: $(ASTYLE_CHECK_STAMPS)
+$(ASTYLE_CHECK_STAMPS): $(ODIR)/%.astyle-check-stamp : %
+	$(ASTYLE_BINARY) --options=.astylerc -n $< && mkdir -p $(@D) && touch $@
 
 # Test whether the system has a version of astyle that supports --dry-run
 ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo)
@@ -1166,10 +1168,12 @@ else
 	@echo Cannot run an astyle check, your system either does not have astyle, or it is too old.
 endif
 
-style-json: json_blacklist $(JSON_FORMATTER_BIN)
+JSON_SOURCES := $(shell find data -name "*.json")
+JSON_CHECK_STAMPS = $(sort $(patsubst %,$(ODIR)/%,$(JSON_SOURCES:.json=.jstyle-check-stamp)))
+style-json : $(JSON_CHECK_STAMPS) $(JSON_FORMATTER_BIN)
+$(JSON_CHECK_STAMPS) : $(ODIR)/%.jstyle-check-stamp : %.json $(JSON_FORMATTER_BIN)
 ifndef CROSS
-	find data gfx -name "*.json" -print0 | grep -v -z -F -f json_blacklist | \
-	  xargs -0 -L 1 $(JSON_FORMATTER_BIN)
+	$(JSON_FORMATTER_BIN) $< && mkdir -p $(@D) && touch $@
 else
 	@echo Cannot run json formatter in cross compiles.
 endif

data/json/itemgroups/tools.json

@@ -10,7 +10,7 @@
       [ "swage", 60 ],
       [ "drift", 70 ],
       [ "hotcut", 90 ],
-      [ "tongs", 90 ],
+      [ "metalworking_tongs", 90 ],
       [ "hammer", 90 ],
       [ "sandpaper", 90 ]
     ]

data/json/items/fake.json

@@ -60,12 +60,12 @@
     "copy-from": "fake_item",
     "type": "TOOL",
     "name": { "str_sp": "autonomous surgical scalpels" },
-    "description": "A system of surgical grade scalpels.  They allow you to make precise cuts and can also be used as a high-quality butchering tool.",
+    "description": "A system of surgical grade scalpels.  They allow you to make precise cuts on corpses.",
     "to_hit": 2,
     "cutting": 8,
     "techniques": [ "PRECISE" ],
     "flags": [ "TRADER_AVOID", "NO_UNWIELD", "UNBREAKABLE_MELEE", "SPEAR" ],
-    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 5 ], [ "BUTCHER", 50 ] ]
+    "qualities": [ [ "CUT", 1 ], [ "CUT_FINE", 5 ], [ "BUTCHER", 14 ] ]
   },
   {
     "id": "fake_razor",

data/json/items/generic.json

@@ -3703,5 +3703,37 @@
     "cutting": 4,
     "to_hit": -3,
     "flags": [ "TRADER_AVOID", "NO_REPAIR" ]
+  },
+  {
+    "type": "TOOL",
+    "id": "training_dummy_light",
+    "symbol": "@",
+    "color": "brown",
+    "name": { "str": "training dummy" },
+    "category": "other",
+    "description": "A hand-made humanoid figure, useful for training in close quarters combat.  This one is made from wood and it has some duct tape to mark the striking points.",
+    "price": 15000,
+    "price_postapoc": 600,
+    "material": [ "wood" ],
+    "weight": "50 kg",
+    "volume": "80 L",
+    "bashing": 12,
+    "to_hit": -2
+  },
+  {
+    "type": "TOOL",
+    "id": "training_dummy_heavy",
+    "symbol": "@",
+    "color": "light_gray",
+    "name": { "str": "armored training dummy" },
+    "category": "other",
+    "description": "A hand-made humanoid figure, useful for training in close quarters combat.  This one is covered in scrap armor and looks on guard.",
+    "price": 15000,
+    "price_postapoc": 1000,
+    "material": [ "steel", "wood" ],
+    "weight": "55 kg",
+    "volume": "80 L",
+    "bashing": 14,
+    "to_hit": -2
   }
 ]

data/json/items/gun/223.json

@@ -527,22 +527,36 @@
     "id": "m231pfw",
     "copy-from": "m16a4",
     "type": "GUN",
-    "name": { "str": "M16 open-bolt rifle" },
-    "description": "The M16 open-bolt rifle is an M16 rifle modified to fire with an open-bolt design.  This makes the rifle fire at much higher speeds than most other assault rifles, but at the cost of accuracy.  It is chambered in 5.56x45mm and accepts STANAG magazines.",
+    "name": { "str": "M16 firing port gun" },
+    "description": "The M16 firing port gun is an M16 rifle modified to fire with an open-bolt design at ludicrous speeds, without sights.  It has a threaded handguard to screw into an armored vehicle's firing ports.  It is chambered in 5.56x45mm and accepts STANAG magazines.",
     "weight": "3330 g",
     "volume": "2400 ml",
     "longest_side": "727 mm",
-    "price": 90000,
+    "price": 3450000,
     "price_postapoc": 3500,
     "variant_type": "gun",
     "variants": [
       {
         "id": "m231pfw",
         "name": { "str": "M231 port firing weapon" },
-        "description": "The M231 PFW is an adaptation of the M16 assault rifle, designed to be used in the firing ports of the M2 Bradley Infantry Fighting Vehicle.  It does not have a buttstock or front sight post, and the smooth front hand guard makes it slighly less ergonomic.  It fires from an open bolt.  The fire selector says only 'SAFE' and 'AUTO'.  You can't help but wonder which one is preferable."
+        "description": "The M231 PFW is an adaptation of the M16 assault rifle, designed to be used in the firing ports of the M2 Bradley Infantry Fighting Vehicle.  It does not have a buttstock or front sight post, and the smooth front hand guard does nothing to protect you from the potentially scorching hot barrel collar, making it slighly less than ergonomic.  You could screw it into a firing port if you were so inclined.  The fire selector says only 'SAFE' and 'AUTO'.  You can't help but wonder which one is preferable."
       }
     ],
     "dispersion": 350,
+    "sight_dispersion": 500,
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "mechanism", 4 ],
+      [ "magazine", 1 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 2 ],
+      [ "sights mount", 1 ],
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
+    ],
     "//": "This weapon has an extremely high rate of fire, due to the open bolt design. This is based on a cyclic rate of fire of 1150 RPM, which is close to 19 rounds per second. 6 rounds is comparable to to other weapons with similar rates, such as the MAC-11.",
     "modes": [ [ "DEFAULT", "auto", 6 ] ]
   },

data/json/items/tool/metalworking.json

@@ -293,7 +293,7 @@
     "id": "tongs",
     "type": "TOOL",
     "name": { "str": "pair of metal tongs", "str_pl": "pairs of metal tongs" },
-    "description": "These are long, metal tongs.  They are commonly used for cooking or in metalworking fabrication recipes.",
+    "description": "These are long, metal tongs.  They are commonly used for cooking.",
     "weight": "540 g",
     "volume": "500 ml",
     "price": 1600,
@@ -306,6 +306,23 @@
     "use_action": [ "HEAT_FOOD" ],
     "flags": [ "BELT_CLIP", "ALLOWS_REMOTE_USE" ]
   },
+  {
+    "id": "metalworking_tongs",
+    "type": "TOOL",
+    "name": { "str": "pair of flatjaw tongs", "str_pl": "pairs of flatjaw tongs" },
+    "description": "These are a pair of flatjaw tongs.  They are commonly used for metalworking, fabrication or forging recipes.",
+    "weight": "750 g",
+    "volume": "500 ml",
+    "price": 1600,
+    "price_postapoc": 10,
+    "bashing": 6,
+    "material": [ "steel" ],
+    "symbol": ";",
+    "color": "light_gray",
+    "qualities": [ [ "COOK", 1 ] ],
+    "use_action": [ "HEAT_FOOD" ],
+    "flags": [ "BELT_CLIP", "ALLOWS_REMOTE_USE" ]
+  },
   {
     "id": "sandpaper",
     "type": "TOOL",

data/json/items/vehicle/wheel.json

@@ -70,10 +70,10 @@
     "name": { "str": "medium steel rim" },
     "description": "A medium size steel rim for a car tire.",
     "weight": "5245 g",
-    "volume": "4 L",
+    "volume": "28 L",
     "bashing": 8,
     "to_hit": -4,
-    "longest_side": "254 mm",
+    "longest_side": "432 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -87,10 +87,10 @@
     "name": { "str": "steel motorbike rim" },
     "description": "A steel rim for a motorbike tire.",
     "weight": "3000 g",
-    "volume": "4 L",
+    "volume": "12 L",
     "bashing": 8,
     "to_hit": -4,
-    "longest_side": "254 mm",
+    "longest_side": "508 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -104,10 +104,10 @@
     "name": { "str": "wide steel rim" },
     "description": "A wide steel rim for a larger tire.",
     "weight": "7600 g",
-    "volume": "7500 ml",
+    "volume": "70 L",
     "bashing": 10,
     "to_hit": -4,
-    "longest_side": "254 mm",
+    "longest_side": "610 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -119,12 +119,12 @@
     "type": "GENERIC",
     "category": "veh_parts",
     "name": { "str": "bicycle rim" },
-    "description": "A spoked rim for a bicycle tire.",
+    "description": "A large spoked rim for a bicycle tire.",
     "weight": "750 g",
-    "volume": "5 L",
+    "volume": "11 L",
     "bashing": 6,
     "to_hit": -2,
-    "longest_side": "254 mm",
+    "longest_side": "686 mm",
     "price": 5000,
     "price_postapoc": 500,
     "material": [ "steel" ],
@@ -256,7 +256,7 @@
     "name": { "str": "deflated 17\" wheel" },
     "description": "A car wheel.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "8845 g",
-    "volume": "10 L",
+    "volume": "28 L",
     "longest_side": "432 mm",
     "price": 10000,
     "price_postapoc": 750,
@@ -274,7 +274,7 @@
     "name": { "str": "deflated 16\" racing wheel" },
     "description": "A wide, smooth wheel intended for racing.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "12600 g",
-    "volume": "13750 ml",
+    "volume": "28 L",
     "longest_side": "407 mm",
     "price": 24000,
     "price_postapoc": 500,
@@ -291,7 +291,7 @@
     "name": { "str": "deflated 16\" motorbike wheel" },
     "description": "A motorbike wheel.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "5443 g",
-    "volume": "8250 ml",
+    "volume": "12 L",
     "longest_side": "407 mm",
     "price": 14000,
     "price_postapoc": 500,
@@ -316,7 +316,7 @@
     "name": { "str": "deflated 24\" wide wheel" },
     "description": "A wide wheel.  \\o/ This wide.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "22600 g",
-    "volume": "17500 ml",
+    "volume": "70 L",
     "longest_side": "610 mm",
     "price": 34000,
     "price_postapoc": 750,
@@ -340,7 +340,7 @@
     "name": { "str": "deflated 27\" bicycle wheel" },
     "description": "A bicycle wheel.  It is currently deflated and will need to be inflated to be used on a vehicle.",
     "weight": "1500 g",
-    "volume": "7 L",
+    "volume": "11 L",
     "longest_side": "686 mm",
     "price": 4000,
     "price_postapoc": 250,
@@ -364,7 +364,7 @@
     "name": { "str": "wheel" },
     "description": "A car wheel.",
     "weight": "8845 g",
-    "volume": "10 L",
+    "volume": "28 L",
     "longest_side": "432 mm",
     "price": 10000,
     "price_postapoc": 750,
@@ -383,7 +383,7 @@
     "name": { "str": "racing wheel" },
     "description": "A wide, smooth wheel intended for racing.  The slick surface provides better speed on pavement but penalizes off-road speed.",
     "weight": "12600 g",
-    "volume": "13750 ml",
+    "volume": "28 L",
     "longest_side": "407 mm",
     "price": 24000,
     "price_postapoc": 500,
@@ -440,7 +440,7 @@
     "name": { "str": "bicycle wheel" },
     "description": "A bicycle wheel.",
     "weight": "1500 g",
-    "volume": "7 L",
+    "volume": "11 L",
     "longest_side": "686 mm",
     "price": 4000,
     "price_postapoc": 250,
@@ -556,7 +556,7 @@
     "name": { "str": "motorbike wheel" },
     "description": "A motorbike wheel.",
     "weight": "5443 g",
-    "volume": "8250 ml",
+    "volume": "12 L",
     "longest_side": "407 mm",
     "price": 14000,
     "price_postapoc": 500,
@@ -679,7 +679,7 @@
     "name": { "str": "wide wheel" },
     "description": "A wide wheel.  \\o/ This wide.",
     "weight": "22600 g",
-    "volume": "17500 ml",
+    "volume": "70 L",
     "longest_side": "610 mm",
     "price": 34000,
     "price_postapoc": 750,