Merge branch 'master' into meh

.github/workflows/pr-validator.yml

@@ -3,6 +3,7 @@ on:
   pull_request:
     branches:
     - master
+    types: [opened, edited, synchronize]
 jobs:
   validate:
     name: Validate PR
@@ -12,3 +13,4 @@ jobs:
         uses: CleverRaven/pr-validator@master
         with:
           description-regex: '(\n|^)\s*`{0,3}SUMMARY: +(None|((Features|Content|Interface|Mods|Balance|Bugfixes|Performance|Infrastructure|Build|I18N) +".*"))`{0,3}\s*(\n|$)'
+          description-regex-flags: 'i'

CMakeLists.txt

@@ -1,5 +1,5 @@
 # Main project build script
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.1.4)
 
 PROJECT(CataclysmDDA)
 
@@ -225,10 +225,12 @@ ELSE()
 		-Wpedantic")
 	# Compact the whitespace in the warning string
 	string(REGEX REPLACE "[\t ]+" " " CATA_WARNINGS "${CATA_WARNINGS}")
-	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS} -std=c++14")
+	SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CATA_WARNINGS}")
 	SET(CMAKE_CXX_FLAGS_DEBUG "-Og -g")
 ENDIF()
 
+SET(CMAKE_CXX_STANDARD 14)
+
 # Force out-of-source build
 IF(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	MESSAGE(FATAL_ERROR

data/json/furniture_and_terrain/furniture-surfaces.json

@@ -176,6 +176,7 @@
     "coverage": 40,
     "required_str": -1,
     "deployed_item": "tourist_table",
+    "looks_like": "f_table",
     "flags": [ "TRANSPARENT", "MOUNTABLE", "SHORT", "FLAT_SURF" ],
     "deconstruct": { "items": [ { "item": "tourist_table", "count": 1 } ] },
     "bash": {

data/json/itemgroups/guns.json

@@ -488,6 +488,7 @@
       { "item": "hk_mp5sd", "prob": 5, "charges-min": 0, "charges-max": 30 },
       { "item": "m1014", "prob": 10, "charges-min": 0, "charges-max": 8 },
       { "item": "m4a1", "prob": 35, "charges-min": 0, "charges-max": 30 },
+      { "item": "as50", "prob": 5, "charges-min": 0, "charges-max": 10 },
       { "item": "hk417_13", "prob": 30, "charges-min": 0, "charges-max": 20 }
     ]
   },

data/json/itemgroups/magazines.json

@@ -92,6 +92,7 @@
       [ "ump45mag", 20 ],
       [ "usp45mag", 10 ],
       [ "usp9mag", 10 ],
+      [ "as50mag", 2 ],
       [ "hk417mag_20rd", 20 ]
     ]
   },

data/json/itemgroups/tools.json

@@ -413,7 +413,7 @@
       [ "mobile_memory_card_science", 40 ],
       [ "camera_pro", 2 ],
       [ "element", 5 ],
-      [ "battery", 10 ],
+      [ "light_battery_cell", 10 ],
       [ "goggles_welding", 20 ],
       [ "sm_extinguisher", 10 ],
       [ "toolbox", 5 ],

data/json/items/ammo/10mm.json

@@ -22,6 +22,15 @@
     "recoil": 750,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_10mm_fmj",
+    "copy-from": "10mm_fmj",
+    "type": "AMMO",
+    "name": "10mm Auto FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_10mm_fmj",
     "copy-from": "10mm_fmj",

data/json/items/ammo/22.json

@@ -54,6 +54,24 @@
     "proportional": { "range": 0.6, "damage": 0.5, "recoil": 0.5 },
     "extend": { "effects": [ "SHOT", "NOGIB" ] }
   },
+  {
+    "id": "bp_22_fmj",
+    "copy-from": "22_fmj",
+    "type": "AMMO",
+    "name": ".22 LR FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_22_lr",
+    "copy-from": "22_lr",
+    "type": "AMMO",
+    "name": ".22 LR blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_22_lr",
     "copy-from": "22_lr",

data/json/items/ammo/223.json

@@ -42,6 +42,33 @@
     "description": "This ammunition is a one-in-five mix of M855A1 and M856 tracer rounds to help keep the weapon they are fired from on target.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
+  {
+    "id": "bp_223",
+    "copy-from": "223",
+    "type": "AMMO",
+    "name": ".223 Remington blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_556",
+    "copy-from": "556",
+    "type": "AMMO",
+    "name": "5.56 NATO blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_556_incendiary",
+    "copy-from": "556_incendiary",
+    "type": "AMMO",
+    "name": "5.56 NATO tracer blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.57, "recoil": 0.57, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_223",
     "copy-from": "223",

data/json/items/ammo/270win.json

@@ -22,6 +22,15 @@
     "recoil": 3800,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
   },
+  {
+    "id": "bp_270win_jsp",
+    "copy-from": "270win_jsp",
+    "type": "AMMO",
+    "name": ".270 Winchester JSP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.7, "recoil": 0.7, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_270win_jsp",
     "copy-from": "270win_jsp",

data/json/items/ammo/300.json

@@ -22,6 +22,15 @@
     "recoil": 5300,
     "effects": [ "COOKOFF" ]
   },
+  {
+    "id": "bp_300_winmag",
+    "copy-from": "300_winmag",
+    "type": "AMMO",
+    "name": ".300 Winchester Magnum blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_300_winmag",
     "copy-from": "300_winmag",

data/json/items/ammo/3006.json

@@ -38,6 +38,33 @@
     "description": "Armor piercing .30-06 M2 ammunition with 168gr FMJ bullets.  It is an extremely powerful and accurate cartridge but pays for its armor penetration abilities with lowered damage.",
     "relative": { "damage": -4, "pierce": 8 }
   },
+  {
+    "id": "bp_3006",
+    "copy-from": "3006",
+    "type": "AMMO",
+    "name": ".30-06 Springfield blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_3006_incendiary",
+    "copy-from": "3006_incendiary",
+    "type": "AMMO",
+    "name": ".30-06 Springfield tracer blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_3006fmj",
+    "copy-from": "bp_3006",
+    "type": "AMMO",
+    "name": ".30-06 Springfield M2 AP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_3006",
     "copy-from": "3006",

data/json/items/ammo/300blk.json

@@ -33,6 +33,15 @@
     "damage": 26,
     "recoil": 1700
   },
+  {
+    "id": "bp_300blk",
+    "copy-from": "300blk",
+    "type": "AMMO",
+    "name": ".300 AAC Blackout blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_300blk",
     "copy-from": "300blk",

data/json/items/ammo/308.json

@@ -41,6 +41,33 @@
     "description": "This ammunition is a one-in-five mix of M80 and M62 tracer rounds to help keep the weapon they are fired from on target.",
     "extend": { "effects": [ "INCENDIARY" ] }
   },
+  {
+    "id": "bp_308",
+    "copy-from": "308",
+    "type": "AMMO",
+    "name": ".308 Winchester blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_762_51",
+    "copy-from": "762_51",
+    "type": "AMMO",
+    "name": "7.62x51mm blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_762_51_incendiary",
+    "copy-from": "762_51_incendiary",
+    "type": "AMMO",
+    "name": "7.62x51mm tracer blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_308",
     "copy-from": "308",

data/json/items/ammo/357mag.json

@@ -30,6 +30,24 @@
     "description": "Jacketed hollow point .357 magnum ammunition.  The .357 magnum round is derived from the earlier .38 special, with a marginally longer case and generating greater pressure.",
     "relative": { "damage": 4, "pierce": -2 }
   },
+  {
+    "id": "bp_357mag_fmj",
+    "copy-from": "357mag_fmj",
+    "type": "AMMO",
+    "name": ".357 Magnum FMJ blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
+  {
+    "id": "bp_357mag_jhp",
+    "copy-from": "357mag_jhp",
+    "type": "AMMO",
+    "name": ".357 Magnum JHP blackpowder",
+    "proportional": { "price": 0.3, "damage": 0.76, "recoil": 0.76, "pierce": 0.5, "dispersion": 1.2 },
+    "extend": { "effects": [ "RECYCLED", "BLACKPOWDER", "MUZZLE_SMOKE" ] },
+    "delete": { "effects": [ "NEVER_MISFIRES" ] }
+  },
   {
     "id": "reloaded_357mag_fmj",
     "copy-from": "357mag_fmj",

data/json/items/archery.json

@@ -650,9 +650,10 @@
     "weight": "268 g",
     "bashing": 1,
     "cutting": 10,
-    "thrown_damage": [ { "damage_type": "cut", "amount": 14 } ],
+    "thrown_damage": [ { "damage_type": "stab", "amount": 14 } ],
     "ammo_type": "thrown",
-    "count": 5
+    "count": 5,
+    "flags": [ "STAB", "DURABLE_MELEE", "SHEATH_KNIFE" ]
   },
   {
     "type": "GENERIC",

data/json/items/armor.json

@@ -9170,7 +9170,7 @@
     "storage": "3500 ml",
     "warmth": 50,
     "material_thickness": 3,
-    "flags": [ "VARSIZE", "POCKETS", "HOOD", "OUTER" ]
+    "flags": [ "VARSIZE", "POCKETS", "HOOD", "OUTER", "WATERPROOF" ]
   },
   {
     "id": "winter_pants_army",

data/json/items/classes/gun.json

@@ -102,6 +102,7 @@
     "reload": 150,
     "extend": { "flags": [ "RELOAD_ONE", "NO_UNLOAD" ] },
     "//": "Slower reloads, no unloading.  Base, unskilled person should take 1.5 seconds per chamber.  No underbarrel mods, that's where the ram goes.",
+    "faults": [ "fault_gun_blackpowder", "fault_gun_clogged" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],

data/json/items/gun/12mm.json

@@ -4,7 +4,7 @@
     "copy-from": "gun_base",
     "type": "GUN",
     "name": "H&K G80 Railgun",
-    "description": "Developed by Heckler & Koch in 2033, the railgun magnetically propels a ferromagnetic projectile using an alternating current.  Powered by UPS.",
+    "description": "Developed by Heckler & Koch in the first quarter of 21st century, the railgun magnetically propels a ferromagnetic projectile using an alternating current.  Powered by UPS.",
     "weight": "3914 g",
     "volume": "2750 ml",
     "price": 1920000,
@@ -19,7 +19,6 @@
     "ups_charges": 5,
     "valid_mod_locations": [
       [ "accessories", 4 ],
-      [ "emitter", 1 ],
       [ "grip", 1 ],
       [ "mechanism", 4 ],
       [ "rail", 1 ],