Merge branch 'spring-refactor' into test-release

joveeater · May 21, 2023 · 8b18e99 · 8b18e99
2 parents 0a03945 + d42f9c5
commit 8b18e99
Show file tree

Hide file tree

Showing 100 changed files with 5,198 additions and 5,908 deletions.
diff --git a/data/json/field_type.json b/data/json/field_type.json
@@ -291,8 +291,7 @@
             "body_part": "mouth",
             "intensity": 4,
             "min_duration": "15 seconds",
-            "max_duration": "15 seconds",
-            "immune_inside_vehicle": true
+            "max_duration": "15 seconds"
           }
         ],
         "scent_neutralization": 5

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/data/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -717,5 +717,10 @@
       { "item": "medium_atomic_battery_cell", "prob": 2, "charges": 5000 },
       { "item": "heavy_atomic_battery_cell", "prob": 1, "charges": 10000 }
     ]
+  },
+  {
+    "id": "mech_power_cell_spawn",
+    "type": "item_group",
+    "items": [ { "item": "huge_atomic_battery_cell", "prob": 10, "charges": [ 0, 100000 ] } ]
   }
 ]
diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json
@@ -16,9 +16,9 @@
     "color": "dark_gray",
     "count": 10,
     "ammo_type": "metal_rail",
-    "range": 40,
-    "damage": { "damage_type": "stab", "amount": 70, "armor_penetration": 25 },
-    "dispersion": 150,
+    "range": 20,
+    "damage": { "damage_type": "stab", "amount": 60, "armor_penetration": 10 },
+    "dispersion": 200,
     "effects": [ "RECYCLED", "NON-FOULING" ]
   },
   {
@@ -34,8 +34,8 @@
     "cutting": 2,
     "material": [ "steel" ],
     "color": "light_gray",
-    "dispersion": 0,
+    "dispersion": 100,
     "effects": [ "NEVER_MISFIRES", "NON-FOULING" ],
-    "relative": { "range": 10, "damage": { "damage_type": "stab", "amount": -5, "armor_penetration": 15 } }
+    "relative": { "range": 10, "damage": { "damage_type": "stab", "amount": -10, "armor_penetration": 20 } }
   }
 ]
diff --git a/data/json/items/gun/metal_rail.json b/data/json/items/gun/metal_rail.json
@@ -0,0 +1,50 @@
+[
+  {
+    "id": "heavy_rail_rifle",
+    "copy-from": "rifle_magnetic",
+    "type": "GUN",
+    "name": { "str": "heavy rail rifle" },
+    "description": "This overpowered and overengineered variant of the ferromagnetic rail rifle was designed to deliver electromagnetically-driven obliteration right through whatever obstacles that lies in front of it, be it buildings, vehicles or hordes of walking dead.  However, the hefty bulk and weight of this weapon compared to most contemporary rifles makes it unfeasible to fire without supporting it properly; not to mention that it consumes UPS charges at a tremendous rate, making it impractical for use in prolonged engagements.",
+    "weight": "15 kg",
+    "volume": "5 L",
+    "price": "9000 USD",
+    "price_postapoc": "90 USD",
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": "metal_rail",
+    "range": 10,
+    "ranged_damage": { "damage_type": "stab", "amount": 40 },
+    "dispersion": 200,
+    "durability": 7,
+    "clip_size": 10,
+    "ups_charges": 120,
+    "reload": 200,
+    "ammo_effects": [ "INCENDIARY", "TRAIL" ],
+    "extend": { "flags": [ "RELOAD_ONE", "MOUNTED_GUN" ] }
+  },
+  {
+    "id": "rebar_rifle",
+    "copy-from": "rifle_magnetic",
+    "type": "GUN",
+    "name": { "str": "ferromagnetic rail rifle" },
+    "description": "A single-shot, electrically propelled, steel rail launcher handcrafted from scrap.  The hypervelocity metal stake that it fires is accelerated to the point of spontaneous combustion by a Lorentz force generated by electromagnetic induction, powered by a standard UPS.",
+    "weight": "5 kg",
+    "volume": "2500 ml",
+    "price": "5500 USD",
+    "price_postapoc": "60 USD",
+    "to_hit": -3,
+    "bashing": 10,
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "ammo": "metal_rail",
+    "ranged_damage": { "damage_type": "stab", "amount": 20 },
+    "dispersion": 100,
+    "durability": 6,
+    "clip_size": 1,
+    "ups_charges": 60,
+    "reload": 200,
+    "ammo_effects": [ "INCENDIARY", "TRAIL" ]
+  }
+]
diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json
@@ -644,8 +644,8 @@
     "category": "tools",
     "name": { "str": "mortar and pestle", "str_pl": "mortars and pestles" },
     "description": "This is a simple combination of a small grindstone and a bowl-shaped stone.  Used for grinding grain, but time-consuming compared to more complex methods.",
-    "weight": "1632 g",
-    "volume": "1 L",
+    "weight": "1000 g",
+    "volume": "400 ml",
     "price": 0,
     "price_postapoc": 10,
     "to_hit": -4,

diff --git a/data/json/mapgen/bunker.json b/data/json/mapgen/bunker.json
@@ -102,11 +102,18 @@
       },
       "furniture": { "r": "f_rack" },
       "items": { "r": { "item": "bunker_basement_loot", "chance": 15, "repeat": [ 2, 8 ] } },
-      "place_monster": [
-        { "monster": "mon_mech_combat", "x": 5, "y": 5, "chance": 2 },
-        { "monster": "mon_mech_lifter", "x": 6, "y": 6, "chance": 5 },
-        { "monster": "mon_mech_recon", "x": 7, "y": 6, "chance": 3 }
-      ]
+      "place_nested": [ { "chunks": [ [ "null", 9 ], "bunker_mech_spawn" ], "x": 5, "y": 5 } ]
+    }
+  },
+  {
+    "type": "mapgen",
+    "method": "json",
+    "nested_mapgen_id": "bunker_mech_spawn",
+    "weight": 25,
+    "object": {
+      "mapgensize": [ 3, 3 ],
+      "place_loot": [ { "group": "mech_power_cell_spawn", "x": [ 0, 2 ], "y": 2 } ],
+      "place_monster": [ { "monster": [ "mon_mech_combat", "mon_mech_lifter", "mon_mech_recon" ], "x": [ 0, 1 ], "y": [ 0, 1 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/lab/lab_floorplans_finale1level.json b/data/json/mapgen/lab/lab_floorplans_finale1level.json
@@ -38,6 +38,7 @@
       "terrain": { "?": "t_nanofab", "r": "t_metal_floor", "/": "t_nanofab_body" },
       "mapping": { "r": { "item": { "item": "standard_template_construct" } }, "R": { "item": { "item": "nanomaterial" } } },
       "place_nested": [ { "chunks": [ "lab_finale_loot" ], "x": 6, "y": 11 } ],
+      "place_loot": [ { "group": "mech_power_cell_spawn", "x": [ 4, 5 ], "y": [ 3, 5 ] } ],
       "place_monster": [
         { "monster": "mon_secubot", "x": [ 1, 4 ], "y": [ 20, 22 ], "chance": 90 },
         { "monster": "mon_secubot", "x": [ 19, 20 ], "y": [ 20, 22 ], "chance": 90 },

diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
@@ -19,7 +19,11 @@
       { "monster": "mon_zombie_static", "freq": 50, "cost_multiplier": 3 },
       { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 },
       { "monster": "mon_zombie_hulk", "freq": 1, "cost_multiplier": 50 },
-      { "monster": "mon_skeleton_hulk", "freq": 1, "cost_multiplier": 50 }
+      { "monster": "mon_skeleton_hulk", "freq": 1, "cost_multiplier": 50 },
+      { "monster": "mon_feral_scientist_scalpel", "freq": 10, "cost_multiplier": 1 },
+      { "monster": "mon_feral_labsecurity_9mm", "starts": 250, "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_labsecurity_flashlight", "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_human_tool", "freq": 5, "cost_multiplier": 1 }
     ]
   },
   {
@@ -52,7 +56,11 @@
       { "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 5 },
       { "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "freq": 15, "cost_multiplier": 15 },
-      { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 }
+      { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_feral_scientist_scalpel", "freq": 10, "cost_multiplier": 1 },
+      { "monster": "mon_feral_labsecurity_9mm", "starts": 250, "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_labsecurity_flashlight", "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_human_tool", "freq": 5, "cost_multiplier": 1 }
     ]
   },
   {
@@ -85,7 +93,11 @@
       { "monster": "mon_zombie_bio_op2", "freq": 25, "cost_multiplier": 5, "starts": 1440 },
       { "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 5 },
       { "monster": "mon_zombie_brute_shocker", "freq": 5, "cost_multiplier": 5 },
-      { "monster": "mon_haulerbot", "freq": 5, "cost_multiplier": 0 }
+      { "monster": "mon_haulerbot", "freq": 5, "cost_multiplier": 0 },
+      { "monster": "mon_feral_scientist_scalpel", "starts": 250, "freq": 10, "cost_multiplier": 1 },
+      { "monster": "mon_feral_labsecurity_9mm", "starts": 500, "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_labsecurity_flashlight", "starts": 250, "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_human_tool", "starts": 250, "freq": 5, "cost_multiplier": 1 }
     ]
   },
   {
@@ -108,7 +120,9 @@
       { "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 8 },
       { "monster": "mon_zombie_electric", "freq": 50, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "freq": 15, "cost_multiplier": 15 },
-      { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 }
+      { "monster": "mon_zombie_brute_shocker", "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_feral_labsecurity_9mm", "starts": 250, "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_feral_labsecurity_flashlight", "freq": 10, "cost_multiplier": 5 }
     ]
   },
   {
@@ -127,7 +141,9 @@
       { "monster": "mon_zombie_hazmat", "freq": 100, "cost_multiplier": 0 },
       { "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 3 },
       { "monster": "mon_zombie_brute", "freq": 5, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_brute_shocker", "freq": 5, "cost_multiplier": 5 }
+      { "monster": "mon_zombie_brute_shocker", "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_scientist_scalpel", "starts": 250, "freq": 10, "cost_multiplier": 1 },
+      { "monster": "mon_feral_soldier", "starts": 250, "freq": 5, "cost_multiplier": 1 }
     ]
   },
   {
@@ -161,7 +177,11 @@
       { "monster": "mon_zombie_electric", "freq": 10, "cost_multiplier": 3 },
       { "monster": "mon_zombie_necro", "freq": 1, "cost_multiplier": 15 },
       { "monster": "mon_zombie_brute_shocker", "freq": 1, "cost_multiplier": 5 },
-      { "monster": "mon_haulerbot", "freq": 1, "cost_multiplier": 0 }
+      { "monster": "mon_haulerbot", "freq": 1, "cost_multiplier": 0 },
+      { "monster": "mon_feral_scientist_scalpel", "freq": 10, "cost_multiplier": 1 },
+      { "monster": "mon_feral_labsecurity_9mm", "starts": 250, "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_labsecurity_flashlight", "freq": 5, "cost_multiplier": 5 },
+      { "monster": "mon_feral_human_tool", "freq": 5, "cost_multiplier": 1 }
     ]
   },
   {

diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json
@@ -21,7 +21,8 @@
     "monsters": [
       { "monster": "mon_zombie_soldier", "freq": 150, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
       { "monster": "mon_zombie_flamer", "freq": 200, "cost_multiplier": 30 },
-      { "monster": "mon_zombie_military_pilot", "freq": 5, "cost_multiplier": 1 }
+      { "monster": "mon_zombie_military_pilot", "freq": 5, "cost_multiplier": 1 },
+      { "monster": "mon_feral_soldier", "starts": 250, "freq": 10, "cost_multiplier": 1 }
     ]
   },
   {
@@ -35,7 +36,8 @@
       { "monster": "mon_zombie_military_pilot", "freq": 5, "cost_multiplier": 1 },
       { "monster": "mon_zombie_bio_op", "freq": 50, "cost_multiplier": 5 },
       { "monster": "mon_zombie_bio_op2", "freq": 25, "cost_multiplier": 5, "starts": 1440 },
-      { "monster": "mon_zombie_armored", "freq": 10, "cost_multiplier": 5 }
+      { "monster": "mon_zombie_armored", "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_feral_soldier", "freq": 25, "cost_multiplier": 1 }
     ]
   },
   {
@@ -53,7 +55,8 @@
       { "monster": "mon_zombie_armored", "freq": 5, "cost_multiplier": 5 },
       { "monster": "mon_zombie_scorched", "freq": 25, "cost_multiplier": 1 },
       { "monster": "mon_zombie_hazmat", "freq": 25, "cost_multiplier": 1 },
-      { "monster": "mon_zombie", "freq": 50, "cost_multiplier": 1 }
+      { "monster": "mon_zombie", "freq": 50, "cost_multiplier": 1 },
+      { "monster": "mon_feral_soldier", "starts": 250, "freq": 25, "cost_multiplier": 1 }
     ]
   },
   {

diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -161,7 +161,10 @@
       { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
       { "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
       { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
-      { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
+      { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 },
+      { "monster": "mon_feral_survivalist", "starts": 250, "freq": 5, "cost_multiplier": 1 },
+      { "monster": "mon_feral_prepper", "starts": 500, "freq": 4, "cost_multiplier": 5 },
+      { "monster": "mon_feral_militia", "starts": 500, "freq": 1, "cost_multiplier": 10 }
     ]
   },
   {
@@ -195,7 +198,10 @@
     "monsters": [
       { "monster": "mon_zombie_tough", "freq": 180, "cost_multiplier": 0 },
       { "monster": "mon_zombie_survivor", "freq": 400, "cost_multiplier": 0 },
-      { "monster": "mon_zombie_survivor_elite", "freq": 20, "cost_multiplier": 25, "starts": 1440 }
+      { "monster": "mon_zombie_survivor_elite", "freq": 20, "cost_multiplier": 25, "starts": 1440 },
+      { "monster": "mon_feral_survivalist", "starts": 250, "freq": 5, "cost_multiplier": 1 },
+      { "monster": "mon_feral_prepper", "starts": 500, "freq": 4, "cost_multiplier": 5 },
+      { "monster": "mon_feral_militia", "starts": 500, "freq": 1, "cost_multiplier": 10 }
     ]
   },
   {
@@ -221,7 +227,10 @@
       { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
       { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 },
       { "monster": "mon_zombie_nurse", "freq": 50, "cost_multiplier": 2 },
-      { "monster": "mon_zombie_runner", "freq": 130, "cost_multiplier": 3 }
+      { "monster": "mon_zombie_runner", "freq": 130, "cost_multiplier": 3 },
+      { "monster": "mon_feral_survivalist", "starts": 250, "freq": 1, "cost_multiplier": 1 },
+      { "monster": "mon_feral_prepper", "starts": 500, "freq": 1, "cost_multiplier": 5 },
+      { "monster": "mon_feral_militia", "starts": 500, "freq": 1, "cost_multiplier": 10 }
     ]
   },
   {
@@ -245,7 +254,10 @@
       { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
       { "monster": "mon_zombie_static", "freq": 180, "cost_multiplier": 5 },
       { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
-      { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
+      { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 },
+      { "monster": "mon_feral_survivalist", "starts": 250, "freq": 1, "cost_multiplier": 1 },
+      { "monster": "mon_feral_prepper", "starts": 500, "freq": 1, "cost_multiplier": 5 },
+      { "monster": "mon_feral_militia", "starts": 500, "freq": 1, "cost_multiplier": 10 }
     ]
   },
   {
@@ -269,7 +281,10 @@
       { "monster": "mon_zombie_swimmer", "freq": 20, "cost_multiplier": 2 },
       { "monster": "mon_zombie_static", "freq": 30, "cost_multiplier": 5 },
       { "monster": "mon_zombie_survivor", "freq": 1, "cost_multiplier": 25 },
-      { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 }
+      { "monster": "mon_zombie_survivor_elite", "freq": 1, "cost_multiplier": 25, "starts": 1440 },
+      { "monster": "mon_feral_survivalist", "starts": 250, "freq": 1, "cost_multiplier": 1 },
+      { "monster": "mon_feral_prepper", "starts": 500, "freq": 1, "cost_multiplier": 5 },
+      { "monster": "mon_feral_militia", "starts": 500, "freq": 1, "cost_multiplier": 10 }
     ]
   },
   {
@@ -596,7 +611,8 @@
       { "monster": "mon_zombie_rot", "freq": 10, "cost_multiplier": 5 },
       { "monster": "mon_zombie_survivor", "freq": 5, "cost_multiplier": 20 },
       { "monster": "mon_zombie_runner", "freq": 10, "cost_multiplier": 5 },
-      { "monster": "mon_zombie_brainless", "freq": 10, "cost_multiplier": 5 }
+      { "monster": "mon_zombie_brainless", "freq": 10, "cost_multiplier": 5 },
+      { "monster": "mon_feral_human_tool", "starts": 250, "freq": 20, "cost_multiplier": 1 }
     ]
   },
   {

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -227,7 +227,7 @@
     "path_settings": { "max_dist": 10 },
     "diff": 5,
     "starting_ammo": { "9mm": 5 },
-    "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], [ "SEARCHLIGHT", 1 ], [ "TAZER", 10 ] ],
+    "special_attacks": [ [ "PARROT_AT_DANGER", 5 ], [ "TAZER", 10 ] ],
     "death_drops": "feral_security_death_drops_flashlight",
     "death_function": [ "NORMAL" ],
     "zombify_into": "mon_zombie_labsecurity",

diff --git a/data/json/not_really_obsolete.json b/data/json/not_really_obsolete.json
@@ -227,34 +227,6 @@
     "count": 20,
     "effects": [ "COOKOFF", "RECYCLED" ]
   },
-  {
-    "id": "mounted_heavy_rail_rifle",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted heavy rail rifle" },
-    "item": "heavy_rail_rifle",
-    "color": "magenta",
-    "broken_color": "magenta",
-    "breaks_into": [ { "item": "scrap", "count": 30 }, { "item": "steel_chunk", "count": 10 }, { "item": "steel_lump", "count": 6 } ],
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] },
-      "removal": { "skills": [ [ "mechanics", 3 ] ] }
-    }
-  },
-  {
-    "id": "mounted_rebar_rifle",
-    "copy-from": "turret",
-    "type": "vehicle_part",
-    "name": { "str": "mounted ferromagnetic rail rifle" },
-    "item": "rebar_rifle",
-    "color": "magenta",
-    "broken_color": "magenta",
-    "breaks_into": [ { "item": "scrap", "count": 9 }, { "item": "steel_chunk", "count": 5 }, { "item": "steel_lump", "count": 2 } ],
-    "requirements": {
-      "install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] },
-      "removal": { "skills": [ [ "mechanics", 3 ] ] }
-    }
-  },
   {
     "id": "pipebomb",
     "type": "TOOL",

diff --git a/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Carlos_Isherwood.json
@@ -20,9 +20,9 @@
     "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },
-    "worn_override": "NC_Isherwood_worn",
-    "carry_override": "NC_ISHERWOOD_rifle",
-    "weapon_override": "NC_ISHERWOOD_archery",
+    "worn_override": "NC_Isherwood_male_worn",
+    "carry_override": "NC_ISHERWOOD_carry",
+    "weapon_override": "EMPTY_GROUP",
     "skills": [
       {
         "skill": "ALL",

diff --git a/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Chris_Isherwood.json
@@ -20,9 +20,9 @@
     "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },
-    "worn_override": "NC_Isherwood_worn",
-    "carry_override": "NC_ISHERWOOD_rifle",
-    "weapon_override": "NC_ISHERWOOD_archery",
+    "worn_override": "NC_Isherwood_male_worn",
+    "carry_override": "NC_ISHERWOOD_carry",
+    "weapon_override": "EMPTY_GROUP",
     "skills": [
       {
         "skill": "ALL",

diff --git a/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json b/data/json/npcs/isherwood_farm/NPC_Claire_Isherwood.json
@@ -20,8 +20,9 @@
     "traits": [ { "group": "NPC_starting_traits" }, { "group": "Appearance_demographics" } ],
     "common": false,
     "bonus_per": { "one_in": 4 },
-    "carry_override": "NC_ISHERWOOD_rifle",
-    "weapon_override": "NC_ISHERWOOD_archery",
+    "worn_override": "NC_Isherwood_female_worn",
+    "carry_override": "NC_ISHERWOOD_carry",
+    "weapon_override": "EMPTY_GROUP",
     "shopkeeper_item_group": "NC_ISHERWOOD_CLAIRE_misc",
     "skills": [
       {