Catchup for Artifact conversions

.github/CONTRIBUTING.md

@@ -233,9 +233,8 @@ You can also set the tracking information at the same time as creating the branc
 
 There is a suite of tests built into the source tree at tests/  
 You should run the test suite after ANY change to the game source.  
-An ordinary invocation of ``make`` will build the test executable at tests/cata_test, and it can be invoked like any ordinary executable, or via `make check`.
-With no arguments it will run the entire test suite.  
-With ``--help`` it will print a number of invocation options you can use to adjust its operation.
+An ordinary invocation of `make` will build the test executable at tests/cata_test, and it can be invoked like any ordinary executable, or via `make check`.
+Running `test/cata_test` with no arguments will run the entire test suite; running it with `--help` will print a number of invocation options you can use to adjust its operation.
 
     $ make
     ... compilation details ...
@@ -248,6 +247,8 @@ With ``--help`` it will print a number of invocation options you can use to adju
 
 I recommend habitually invoking make like ``make YOUR BUILD OPTIONS && make check``.
 
+If you're working with Visual Studio (and don't have `make`), see [Visual Studio-specific advice](../doc/COMPILING/COMPILING-VS-VCPKG.md#running-unit-tests).
+
 ## In-game testing, test environment and the debug menu
 
 Whether you are implementing a new feature or whether you are fixing a bug, it is always a good practice to test your changes in-game. It can be a hard task to create the exact conditions by playing a normal game to be able to test your changes, which is why there is a debug menu. There is no default key to bring up the menu so you will need to assign one first.

build-data/osx/dmgsettings.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+
 
 import biplist
 import os.path

build-scripts/get_all_mods.py

@@ -10,16 +10,18 @@
 
 mods_to_keep = []
 
+
 def add_mods(mods):
     for mod in mods:
-        if not mod in all_mod_dependencies:
+        if mod not in all_mod_dependencies:
             # Either an invalid mod id, or blacklisted.
             return False
     for mod in mods:
-        if not mod in mods_to_keep:
+        if mod not in mods_to_keep:
             mods_to_keep.append(mod)
     return True
 
+
 all_mod_dependencies = {}
 
 for info in glob.glob('data/mods/*/modinfo.json'):
@@ -31,7 +33,7 @@ def add_mods(mods):
                 all_mod_dependencies[ident] = e.get("dependencies", [])
 
 for mod in all_mod_dependencies:
-    if not mod in mods_to_keep:
+    if mod not in mods_to_keep:
         if add_mods(all_mod_dependencies[mod]):
             mods_to_keep.append(mod)
 

build-scripts/lint-json.sh

@@ -1 +1 @@
-find . -name "*json" -type f -exec python -m json.tool {} >/dev/null \;
+find . -name "*json" -type f -exec python3 -m json.tool {} >/dev/null \;

data/json/achievements.json

@@ -73,7 +73,7 @@
     "id": "achievement_marathon",
     "type": "achievement",
     "name": "Pheidippides was a hack",
-    "description": "Run a marathon… plus a little bit more.",
+    "description": "Run a marathon… plus a little more.",
     "requirements": [ { "event_statistic": "num_moves_ran", "is": ">=", "target": 42196 } ]
   },
   {
@@ -298,15 +298,15 @@
     "id": "achievement_lvl_10_barter",
     "type": "achievement",
     "name": "Cut-Me-Own-Throat Dibbler",
-    "description": "My Innuit friend, I'm selling you this ice for such a low price, that it's cutting me own throat.",
+    "description": "My Inuit friend, I'm selling you this ice for such a low price, that it's cutting me own throat.",
     "requirements": [ { "event_statistic": "num_gains_barter_level_10", "is": ">=", "target": 1 } ],
     "hidden_by": [ "achievement_lvl_7_barter" ]
   },
   {
     "id": "achievement_lvl_7_speech",
     "type": "achievement",
     "name": "Eloquent",
-    "description": "We're frends, aren't we?",
+    "description": "We're friends, aren't we?",
     "requirements": [ { "event_statistic": "num_gains_speech_level_7", "is": ">=", "target": 1 } ]
   },
   {
@@ -403,7 +403,7 @@
     "id": "achievement_lvl_10_swimming",
     "type": "achievement",
     "name": "Michael Phelps",
-    "description": "Faster then Jaws.",
+    "description": "Faster than Jaws.",
     "requirements": [ { "event_statistic": "num_gains_swimming_level_10", "is": ">=", "target": 1 } ],
     "hidden_by": [ "achievement_lvl_7_swimming" ]
   },
@@ -418,7 +418,7 @@
     "id": "achievement_lvl_10_fabrication",
     "type": "achievement",
     "name": "Jack of All Trades",
-    "description": "With a right ammount of glue, there is nothing I can't do.",
+    "description": "With a right amount of glue, there is nothing I can't do.",
     "requirements": [ { "event_statistic": "num_gains_fabrication_level_10", "is": ">=", "target": 1 } ],
     "hidden_by": [ "achievement_lvl_7_fabrication" ]
   },
@@ -448,7 +448,7 @@
     "id": "achievement_lvl_10_tailor",
     "type": "achievement",
     "name": "Fashion Designer",
-    "description": "Male, feamale and mutant fashion alike.",
+    "description": "Male, female and mutant fashion alike.",
     "requirements": [ { "event_statistic": "num_gains_tailor_level_10", "is": ">=", "target": 1 } ],
     "hidden_by": [ "achievement_lvl_7_tailor" ]
   },
@@ -486,7 +486,7 @@
     "id": "achievement_lvl_7_archery",
     "type": "achievement",
     "name": "Bull's Eye",
-    "description": "Better then Legolas.",
+    "description": "Better than Legolas.",
     "requirements": [ { "event_statistic": "num_gains_archery_level_7", "is": ">=", "target": 1 } ]
   },
   {
@@ -531,7 +531,7 @@
     "id": "achievement_lvl_7_pistol",
     "type": "achievement",
     "name": "Small But Deadly",
-    "description": "Caliber doesn't count when you're on the recieving side of the barrel.",
+    "description": "Caliber doesn't count when you're on the receiving side of the barrel.",
     "requirements": [ { "event_statistic": "num_gains_pistol_level_7", "is": ">=", "target": 1 } ]
   },
   {

data/json/artifact/relic_procgen_data.json

@@ -2,6 +2,17 @@
   {
     "type": "relic_procgen_data",
     "id": "cult",
+    "charge_types": [
+      {
+        "weight": 100,
+        "charges": { "range": [ 0, 3 ], "power": 25 },
+        "charges_per_use": { "range": [ 1, 1 ], "power": 25 },
+        "max_charges": { "range": [ 1, 3 ], "power": 25 },
+        "recharge_type": "periodic",
+        "time": [ "3 h", "6 h" ]
+      }
+    ],
+    "active_procgen_values": [ { "weight": 100, "spell_id": "AEA_PAIN", "base_power": 50 } ],
     "passive_add_procgen_values": [
       { "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
       {
@@ -37,12 +48,23 @@
         "power_per_increment": 200
       }
     ],
-    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" }, { "weight": 100, "value": "active_enchantment" } ],
     "items": [ { "weight": 100, "item": "spoon" } ]
   },
   {
     "type": "relic_procgen_data",
     "id": "netherum_tunnels",
+    "charge_types": [
+      {
+        "weight": 100,
+        "charges": { "range": [ 0, 3 ], "power": 25 },
+        "charges_per_use": { "range": [ 1, 1 ], "power": 25 },
+        "max_charges": { "range": [ 1, 3 ], "power": 25 },
+        "recharge_type": "periodic",
+        "time": [ "3 h", "6 h" ]
+      }
+    ],
+    "active_procgen_values": [ { "weight": 100, "spell_id": "AEA_PAIN", "base_power": 50 } ],
     "passive_add_procgen_values": [
       { "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
       {
@@ -78,12 +100,23 @@
         "power_per_increment": 200
       }
     ],
-    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" }, { "weight": 100, "value": "active_enchantment" } ],
     "items": [ { "weight": 100, "item": "spoon" } ]
   },
   {
     "type": "relic_procgen_data",
     "id": "alien_reality",
+    "charge_types": [
+      {
+        "weight": 100,
+        "charges": { "range": [ 0, 3 ], "power": 25 },
+        "charges_per_use": { "range": [ 1, 1 ], "power": 25 },
+        "max_charges": { "range": [ 1, 3 ], "power": 25 },
+        "recharge_type": "periodic",
+        "time": [ "3 h", "6 h" ]
+      }
+    ],
+    "active_procgen_values": [ { "weight": 100, "spell_id": "AEA_PAIN", "base_power": 50 } ],
     "passive_add_procgen_values": [
       { "weight": 100, "min_value": -1, "max_value": 1, "type": "STRENGTH", "increment": 1, "power_per_increment": 250 },
       {
@@ -119,7 +152,7 @@
         "power_per_increment": 200
       }
     ],
-    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" } ],
+    "type_weights": [ { "weight": 100, "value": "passive_enchantment_add" }, { "weight": 100, "value": "active_enchantment" } ],
     "items": [ { "weight": 100, "item": "spoon" } ]
   }
 ]

data/json/bionics.json

@@ -268,7 +268,7 @@
     "id": "bio_cqb",
     "type": "bionic",
     "name": { "str": "Close Quarters Battle" },
-    "description": "Bionic processors and databanks, loaded with martial arts combat programs, are surgically integrated into your nervous system.  Whilst active, the CQB module will improve your hand to hand combat skills, but prevents you from improving them through combat experience.",
+    "description": "Bionic processors and databanks, loaded with martial arts combat programs, are surgically integrated into your nervous system.  Whilst active, the CQB module will improve your hand-to-hand combat skills, but prevents you from improving them through combat experience.",
     "occupied_bodyparts": [ [ "head", 4 ] ],
     "act_cost": "20 J",
     "react_cost": "20 J",

data/json/construction.json

@@ -3435,6 +3435,7 @@
     "type": "construction",
     "id": "constr_splitrail_fence",
     "description": "Build Split Rail Fence",
+    "//": "Step 1: Build split rail fence",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ],
     "time": "30 m",
@@ -3443,10 +3444,24 @@
     "pre_flags": "DIGGABLE",
     "post_terrain": "t_splitrail_fence"
   },
+  {
+    "type": "construction",
+    "id": "constr_splitrail_fence_from_posts",
+    "description": "Build Split Rail Fence",
+    "//": "Step 2: Build split rail fence from existing fence posts",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": "15 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 20 ] ] ],
+    "pre_terrain": "t_fence_post",
+    "post_terrain": "t_splitrail_fence"
+  },
   {
     "type": "construction",
     "id": "constr_privacy_fence",
     "description": "Build Privacy Fence",
+    "//": "Step 1: Build privacy fence",
     "category": "CONSTRUCT",
     "required_skills": [ [ "fabrication", 2 ], [ "survival", 1 ] ],
     "time": "30 m",
@@ -3455,6 +3470,32 @@
     "pre_flags": "DIGGABLE",
     "post_terrain": "t_privacy_fence"
   },
+  {
+    "type": "construction",
+    "id": "constr_privacy_fence_from_posts",
+    "description": "Build Privacy Fence",
+    "//": "Step 2: Build privacy fence from existing fence posts",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": "15 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [ [ [ "2x4", 8 ] ], [ [ "nail", 20 ] ] ],
+    "pre_terrain": "t_fence_post",
+    "post_terrain": "t_privacy_fence"
+  },
+  {
+    "type": "construction",
+    "id": "convert_splitrail_to_privacy_fence",
+    "description": "Build Privacy Fence",
+    "//": "Convert Split Rail Fence to Privacy Fence",
+    "category": "CONSTRUCT",
+    "required_skills": [ [ "fabrication", 2 ] ],
+    "time": "10 m",
+    "qualities": [ [ { "id": "HAMMER", "level": 2 } ] ],
+    "components": [ [ [ "2x4", 4 ] ], [ [ "nail", 10 ] ] ],
+    "pre_terrain": "t_splitrail_fence",
+    "post_terrain": "t_privacy_fence"
+  },
   {
     "type": "construction",
     "id": "constr_adobe_brick_wall_halfway",

data/json/furniture_and_terrain/terrain-doors.json

@@ -1803,7 +1803,7 @@
     "type": "terrain",
     "id": "t_door_boarded_damaged",
     "name": "boarded up damaged door",
-    "description": "A boarded up wooden door, except some of the planks are fractured or coming loose.  Without repairs, it could be broken down easily.",
+    "description": "A boarded up wooden door, except that some of the planks are fractured or coming loose.  Without repairs, it could be broken down easily.",
     "symbol": "#",
     "looks_like": "t_door_b",
     "color": "brown",

data/json/itemgroups/Weapons_Mods_Ammo/guns.json

@@ -6,9 +6,13 @@
     "items": [
       { "item": "glock_17", "prob": 35, "charges-min": 0, "charges-max": 15 },
       { "item": "glock_19", "prob": 50, "charges-min": 0, "charges-max": 15 },
+      { "item": "glock_20", "prob": 4, "charges-min": 0, "charges-max": 15 },
       { "item": "glock_22", "prob": 35, "charges-min": 0, "charges-max": 15 },
+      { "item": "glock_29", "prob": 2, "charges-min": 0, "charges-max": 10 },
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 15 },
+      { "item": "glock_40", "prob": 2, "charges-min": 0, "charges-max": 15 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 7 },
+      { "item": "m1911_10", "prob": 15, "charges-min": 0, "charges-max": 7 },
       { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 15 },
       { "item": "px4", "prob": 24, "charges-min": 0, "charges-max": 15 },
       { "item": "px4_40", "prob": 20, "charges-min": 0, "charges-max": 14 },
@@ -19,6 +23,7 @@
       { "item": "sw_619", "prob": 25, "charges-min": 0, "charges-max": 7 },
       { "item": "model_10_revolver", "prob": 20, "charges-min": 0, "charges-max": 6 },
       { "item": "taurus_spectrum", "prob": 15, "charges-min": 0, "charges-max": 6 },
+      { "item": "p220_10", "prob": 1, "charges-min": 0, "charges-max": 8 },
       { "item": "p226_357sig", "prob": 20, "charges-min": 0, "charges-max": 15 },
       { "item": "p320_357sig", "prob": 10, "charges-min": 0, "charges-max": 14 },
       { "item": "kp32", "prob": 10, "charges-min": 0, "charges-max": 7 },
@@ -35,7 +40,9 @@
       { "item": "hptcf380", "prob": 2, "charges-min": 0, "charges-max": 10 },
       { "item": "hptjcp", "prob": 1, "charges-min": 0, "charges-max": 10 },
       { "item": "hptjhp", "prob": 1, "charges-min": 0, "charges-max": 9 },
+      { "item": "xd_10", "prob": 3, "charges-min": 0, "charges-max": 15 },
       { "item": "cz75", "prob": 18, "charges-min": 0, "charges-max": 26 },
+      { "item": "witness_10", "prob": 1, "charges-min": 0, "charges-max": 14 },
       { "item": "walther_ccp", "prob": 8, "charges-min": 0, "charges-max": 8 },
       { "item": "walther_p22", "prob": 13, "charges-min": 0, "charges-max": 10 }
     ]
@@ -48,8 +55,11 @@
       { "item": "glock_17", "prob": 35, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_19", "prob": 50, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_22", "prob": 35, "charges-min": 0, "charges-max": 0 },
+      { "item": "glock_20", "prob": 4, "charges-min": 0, "charges-max": 0 },
+      { "item": "glock_40", "prob": 2, "charges-min": 0, "charges-max": 0 },
       { "item": "glock_31", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "m1911", "prob": 50, "charges-min": 0, "charges-max": 0 },
+      { "item": "m1911_10", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "m9", "prob": 30, "charges-min": 0, "charges-max": 0 },
       { "item": "ruger_lcr_38", "prob": 10, "charges-min": 0, "charges-max": 0 },
       { "item": "sig_mosquito", "prob": 15, "charges-min": 0, "charges-max": 0 },
@@ -58,6 +68,7 @@
       { "item": "sw_619", "prob": 25, "charges-min": 0, "charges-max": 0 },
       { "item": "model_10_revolver", "prob": 20, "charges-min": 0, "charges-max": 0 },
       { "item": "taurus_spectrum", "prob": 15, "charges-min": 0, "charges-max": 0 },
+      { "item": "p220_10", "prob": 1, "charges-min": 0, "charges-max": 0 },
       { "item": "p226_357sig", "prob": 20, "charges-min": 0, "charges-max": 0 },
       { "item": "p320_357sig", "prob": 10, "charges-min": 0, "charges-max": 0 },
       { "item": "kp32", "prob": 10, "charges-min": 0, "charges-max": 0 },
@@ -75,6 +86,8 @@
       { "item": "hptjcp", "prob": 1, "charges-min": 0, "charges-max": 0 },
       { "item": "hptjhp", "prob": 1, "charges-min": 0, "charges-max": 0 },
       { "item": "cz75", "prob": 18, "charges-min": 0, "charges-max": 0 },
+      { "item": "xd_10", "prob": 3, "charges-min": 0, "charges-max": 0 },
+      { "item": "witness_10", "prob": 1, "charges-min": 0, "charges-max": 0 },
       { "item": "walther_ccp", "prob": 8, "charges-min": 0, "charges-max": 0 },
       { "item": "walther_p22", "prob": 13, "charges-min": 0, "charges-max": 0 }
     ]
@@ -98,6 +111,7 @@
       { "item": "sw629", "prob": 40, "charges-min": 0, "charges-max": 6 },
       { "item": "usp_45", "prob": 70, "charges-min": 0, "charges-max": 12 },
       { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 15 },
+      { "item": "TDI_10", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "draco", "prob": 30, "charges-min": 0, "charges-max": 30 }
     ]
   },
@@ -118,6 +132,7 @@
       { "item": "sw629", "prob": 40, "charges-min": 0, "charges-max": 0 },
       { "item": "usp_45", "prob": 70, "charges-min": 0, "charges-max": 0 },
       { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 0 },
+      { "item": "TDI_10", "prob": 1, "charges-min": 0, "charges-max": 0 },
       { "item": "draco", "prob": 30, "charges-min": 0, "charges-max": 0 }
     ]
   },
@@ -243,6 +258,7 @@
     "//": "Imported or otherwise very obscure SMGs.",
     "items": [
       { "item": "ppsh", "prob": 150, "charges-min": 0, "charges-max": 35 },
+      { "item": "hk_mp5_10_semi", "prob": 1, "charges-min": 0, "charges-max": 30 },
       { "item": "skorpion_61", "prob": 100, "charges-min": 0, "charges-max": 20 },
       { "item": "skorpion_82", "prob": 100, "charges-min": 0, "charges-max": 20 }
     ]