Remove some ferals, rework some others (#67707)

* swimmer & diver * archeologist * armored * syntax * Update lab_nested_mutagen.json * round 2 * 2.5 * Revert "armored" This reverts commit 117cf76. * armored * swimmer spawns * return the archaeologist Co-Authored-By: Devengel <[email protected]> --------- Co-authored-by: Devengel <[email protected]>
CleverRaven · Aug 23, 2023 · 5ebd5af · 5ebd5af
1 parent 2ac6a60
commit 5ebd5af
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 87 deletions.
diff --git a/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mutagen.json b/data/json/mapgen/lab/lab_modular/lab_nests_modular/lab_nested_mutagen.json
@@ -1173,10 +1173,7 @@
         "^^^^^^^^^^^^^^^^"
       ],
       "terrain": { "*": "t_water_pool", "^": "t_grate", "|": "t_concrete_wall", "X": "t_laminated_glass" },
-      "place_monster": [
-        { "monster": "mon_zhark", "x": [ 1, 14 ], "y": [ 1, 14 ], "chance": 100, "pack_size": [ 1, 3 ] },
-        { "monster": "mon_feral_diver_knife", "x": [ 1, 14 ], "y": [ 1, 14 ], "chance": 10 }
-      ]
+      "place_monster": [ { "monster": "mon_zhark", "x": [ 1, 14 ], "y": [ 1, 14 ], "chance": 100, "pack_size": [ 1, 3 ] } ]
     }
   },
   {

diff --git a/data/json/mapgen/mine/mine_entrance.json b/data/json/mapgen/mine/mine_entrance.json
@@ -155,6 +155,7 @@
           "failures": [ { "action": "alarm" } ]
         }
       },
+      "place_monster": [ { "monster": "mon_feral_human_archaeologist", "chance": 13, "repeat": [ 1, 2 ], "x": [ 4, 7 ], "y": [ 5, 8 ] } ],
       "gaspumps": { "@": { "fuel": "gasoline", "amount": [ 10000, 50000 ] }, "$": { "fuel": "diesel", "amount": [ 10000, 50000 ] } },
       "vehicles": { "Ø": { "vehicle": "tatra_truck", "chance": 50, "fuel": 40 } },
       "nested": { "`": { "chunks": [ [ "mechanical_fluid", 10 ], [ "gasoline_diesel_motor_oil", 80 ], [ "null", 80 ] ] } },

diff --git a/data/json/mapgen/mine/mine_generic.json b/data/json/mapgen/mine/mine_generic.json
@@ -508,7 +508,6 @@
       },
       "item": { " ": { "item": "material_soil", "chance": 5, "amount": [ 5, 10 ] } },
       "items": { "S": { "item": "archeology_tools", "chance": 90, "repeat": [ 1, 2 ] } },
-      "monster": { " ": { "monster": "mon_feral_human_archaeologist", "chance": 5 } },
       "nested": { "1": { "chunks": [ [ "mine_finale_archaeology", 100 ] ] } }
     }
   },

diff --git a/data/json/mapgen/nested/mine_nested.json b/data/json/mapgen/nested/mine_nested.json
@@ -362,7 +362,7 @@
       "rows": [
         "!!!###",
         "#C  D#",
-        "##!Ac#",
+        "##! c#",
         "##GG##",
         "@####@",
         "@@@@@@"
@@ -391,7 +391,6 @@
         "C": { "item": "museum_misc", "chance": 90, "repeat": [ 1, 2 ] },
         "c": { "item": "museum_primitive", "chance": 90, "repeat": [ 1, 2 ] }
       },
-      "monster": { "A": { "monster": "mon_feral_human_archaeologist" } },
       "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ]
     }
   }

diff --git a/data/json/monsterdrops/feral_humans.json b/data/json/monsterdrops/feral_humans.json
@@ -217,13 +217,13 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "feral_armored_death_drops_mace",
-    "entries": [ { "item": "mace", "prob": 100, "damage": [ 2, 4 ] }, { "group": "default_armored_clothes", "prob": 100 } ]
+    "entries": [ { "item": "mace_fake", "prob": 100, "damage": [ 2, 4 ] }, { "group": "default_armored_clothes", "prob": 100 } ]
   },
   {
     "type": "item_group",
     "subtype": "collection",
     "id": "feral_armored_death_drops_battleaxe",
-    "entries": [ { "item": "battleaxe", "prob": 100, "damage": [ 2, 4 ] }, { "group": "default_armored_clothes", "prob": 100 } ]
+    "entries": [ { "item": "battleaxe_fake", "prob": 100, "damage": [ 2, 4 ] }, { "group": "default_armored_clothes", "prob": 100 } ]
   },
   {
     "type": "item_group",
@@ -465,30 +465,7 @@
       {
         "distribution": [
           { "item": "armor_plarmor", "prob": 25, "damage": [ 1, 4 ] },
-          { "item": "armor_blarmor", "prob": 25, "damage": [ 1, 4 ] },
-          {
-            "distribution": [
-              { "item": "chainmail_suit", "prob": 10, "damage": [ 1, 4 ] },
-              {
-                "collection": [
-                  { "item": "chainmail_hauberk", "prob": 80, "damage": [ 1, 4 ] },
-                  { "item": "chainmail_hood", "prob": 60, "damage": [ 1, 4 ] }
-                ],
-                "prob": 30
-              },
-              {
-                "collection": [
-                  { "item": "gambeson", "prob": 80, "damage": [ 1, 4 ] },
-                  { "item": "chainmail_vest", "prob": 70, "damage": [ 1, 4 ] },
-                  { "item": "chainmail_hood", "prob": 60, "damage": [ 1, 4 ] },
-                  { "item": "chainmail_arms", "prob": 60, "damage": [ 1, 4 ] },
-                  { "item": "chainmail_legs", "prob": 60, "damage": [ 1, 4 ] }
-                ],
-                "prob": 60
-              }
-            ],
-            "prob": 50
-          }
+          { "item": "armor_blarmor", "prob": 25, "damage": [ 1, 4 ] }
         ],
         "prob": 50
       },
@@ -533,18 +510,11 @@
       {
         "distribution": [
           { "item": "boots_plate", "prob": 50, "damage": [ 1, 4 ] },
-          { "item": "chainmail_feet", "prob": 30, "damage": [ 1, 4 ] },
           { "item": "boots_larmor", "prob": 20, "damage": [ 1, 4 ] }
         ],
         "prob": 80
       },
-      {
-        "distribution": [
-          { "item": "gloves_plate", "prob": 60, "damage": [ 1, 4 ] },
-          { "item": "chainmail_hands", "prob": 40, "damage": [ 1, 4 ] }
-        ],
-        "prob": 60
-      }
+      { "distribution": [ { "item": "gloves_plate", "prob": 60, "damage": [ 1, 4 ] } ], "prob": 60 }
     ]
   },
   {
@@ -722,16 +692,7 @@
     "type": "item_group",
     "subtype": "collection",
     "id": "feral_swimmer_death_drops_kickboard",
-    "entries": [
-      { "item": "swimming_kickboard", "prob": 100, "damage": [ 2, 4 ] },
-      { "group": "mon_zombie_swimmer_death_drops", "prob": 100 }
-    ]
-  },
-  {
-    "type": "item_group",
-    "subtype": "collection",
-    "id": "feral_diver_death_drops_knife",
-    "entries": [ { "item": "diveknife", "prob": 100, "damage": [ 2, 4 ] }, { "group": "default_diver_clothing_drops", "prob": 100 } ]
+    "entries": [ { "item": "stick", "prob": 100, "damage": [ 2, 4 ] }, { "group": "mon_zombie_swimmer_death_drops", "prob": 100 } ]
   },
   {
     "type": "item_group",

diff --git a/data/json/monstergroups/military.json b/data/json/monstergroups/military.json
@@ -106,8 +106,13 @@
       { "monster": "mon_zombie_dog", "weight": 5, "cost_multiplier": 2 },
       { "monster": "mon_dog_zombie_rot", "weight": 5, "cost_multiplier": 2 },
       { "monster": "mon_zombie_swimmer_base", "weight": 5, "cost_multiplier": 2 },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 1, "cost_multiplier": 2 },
-      { "monster": "mon_feral_diver_knife", "weight": 1, "cost_multiplier": 5 },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 1,
+        "cost_multiplier": 2,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_zombie_static", "weight": 30, "cost_multiplier": 5 },
       { "monster": "mon_zombie_paramilitary", "weight": 1, "cost_multiplier": 25 },
       { "monster": "mon_zombie_survivor", "weight": 1, "cost_multiplier": 25 },
@@ -139,8 +144,13 @@
       { "monster": "mon_zombie_dog", "weight": 10, "cost_multiplier": 2 },
       { "monster": "mon_dog_zombie_rot", "weight": 5, "cost_multiplier": 2 },
       { "monster": "mon_zombie_swimmer_base", "weight": 10, "cost_multiplier": 2 },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 1, "cost_multiplier": 2 },
-      { "monster": "mon_feral_diver_knife", "weight": 1, "cost_multiplier": 5 },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 1,
+        "cost_multiplier": 2,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_zombie_static", "weight": 30, "cost_multiplier": 5 },
       { "monster": "mon_zombie_paramilitary", "weight": 1, "cost_multiplier": 25 },
       { "monster": "mon_zombie_survivor", "weight": 1, "cost_multiplier": 25 },

diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -32,8 +32,13 @@
       { "monster": "mon_zombie_hazmat", "weight": 10, "cost_multiplier": 3 },
       { "monster": "mon_zombie_fireman", "weight": 10, "cost_multiplier": 2 },
       { "monster": "mon_zombie_swimmer_base", "weight": 10, "cost_multiplier": 5 },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 1, "cost_multiplier": 5 },
-      { "monster": "mon_feral_diver_knife", "weight": 1, "cost_multiplier": 5 },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 1,
+        "cost_multiplier": 5,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_zombie_static", "weight": 10, "cost_multiplier": 5 },
       { "monster": "mon_zombie_paramilitary", "weight": 1, "cost_multiplier": 25 },
       { "monster": "mon_zombie_survivor", "weight": 1, "cost_multiplier": 25 },

diff --git a/data/json/monstergroups/zombies.json b/data/json/monstergroups/zombies.json
@@ -571,8 +571,8 @@
       { "monster": "mon_feral_fancy_rapier", "weight": 50, "cost_multiplier": 5 },
       { "monster": "mon_feral_fancy_rapier_fake", "weight": 100 },
       { "monster": "mon_feral_fancy_crossbow", "weight": 50, "cost_multiplier": 5 },
-      { "monster": "mon_feral_armored_mace", "weight": 10, "cost_multiplier": 10 },
-      { "monster": "mon_feral_armored_battleaxe", "weight": 10, "cost_multiplier": 10 }
+      { "monster": "mon_feral_armored_mace", "weight": 3, "cost_multiplier": 10 },
+      { "monster": "mon_feral_armored_battleaxe", "weight": 3, "cost_multiplier": 10 }
     ]
   },
   {
@@ -618,7 +618,12 @@
     "monsters": [
       { "monster": "mon_zombie_swimmer_base", "weight": 850 },
       { "monster": "mon_zombie_swimmer_base", "weight": 250, "cost_multiplier": 10, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 10 },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 10,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_zombie_child", "weight": 250 },
       { "monster": "mon_zombie", "weight": 100 },
       { "monster": "mon_zombie_tough", "weight": 100 },
@@ -717,7 +722,13 @@
       { "monster": "mon_zombie_swat", "weight": 25, "cost_multiplier": 2 },
       { "monster": "mon_zombie_medical", "weight": 50, "cost_multiplier": 2 },
       { "monster": "mon_zombie", "weight": 325 },
-      { "monster": "mon_zombie_swimmer_base", "weight": 150, "cost_multiplier": 0 },
+      {
+        "monster": "mon_zombie_swimmer_base",
+        "weight": 150,
+        "cost_multiplier": 0,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_feral_swimmer_kickboard", "weight": 20, "cost_multiplier": 0 },
       { "monster": "mon_zombie_resort_dancer", "weight": 150, "cost_multiplier": 0 }
     ]
@@ -793,7 +804,12 @@
       { "monster": "mon_zombie_swimmer", "weight": 100, "cost_multiplier": 2, "starts": "5 days" },
       { "monster": "mon_zombie_swimmer_base", "weight": 815 },
       { "monster": "mon_zombie_swimmer_base", "weight": 50, "cost_multiplier": 10, "pack_size": [ 3, 8 ] },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 10 },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 10,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_zombie_child", "weight": 35 }
     ]
   },
@@ -856,20 +872,31 @@
     "monsters": [
       { "monster": "mon_zombie_swimmer_base", "weight": 950, "cost_multiplier": 2 },
       { "monster": "mon_zombie_swimmer_base", "weight": 50, "cost_multiplier": 10, "pack_size": [ 3, 8 ] },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 5, "cost_multiplier": 2 }
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 5,
+        "cost_multiplier": 2,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
     ]
   },
   {
     "name": "GROUP_DIVING",
     "type": "monstergroup",
     "//": "Zombies/ferals that could be found on a diving related place.",
     "monsters": [
-      { "monster": "mon_feral_diver_knife", "weight": 430, "cost_multiplier": 10 },
       { "group": "GROUP_CIVILIANS_STANDARD", "weight": 20, "cost_multiplier": 0 },
       { "monster": "mon_zombie_swimmer_base", "weight": 100, "cost_multiplier": 2 },
       { "monster": "mon_zombie_swimmer_base", "weight": 50, "cost_multiplier": 10, "pack_size": [ 3, 8 ] },
       { "monster": "mon_zombie", "weight": 50, "cost_multiplier": 3 },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 10, "cost_multiplier": 2 }
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 10,
+        "cost_multiplier": 2,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
     ]
   },
   {
@@ -880,9 +907,21 @@
       { "group": "GROUP_CIVILIANS_STANDARD", "weight": 100, "cost_multiplier": 0 },
       { "monster": "mon_zombie_swimmer_base", "weight": 500, "cost_multiplier": 2 },
       { "monster": "mon_zombie_swimmer_base", "weight": 50, "cost_multiplier": 10, "pack_size": [ 3, 8 ] },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 15, "cost_multiplier": 2 },
-      { "monster": "mon_feral_swimmer_kickboard", "weight": 10, "cost_multiplier": 4, "pack_size": [ 3, 5 ] },
-      { "monster": "mon_feral_diver_knife", "weight": 3, "cost_multiplier": 10 },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 15,
+        "cost_multiplier": 2,
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_feral_swimmer_kickboard",
+        "weight": 10,
+        "cost_multiplier": 4,
+        "pack_size": [ 3, 5 ],
+        "ends": "165 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       { "monster": "mon_zombie", "weight": 5, "cost_multiplier": 3 },
       { "monster": "mon_zombie", "weight": 1, "cost_multiplier": 10, "pack_size": [ 2, 5 ] },
       { "monster": "mon_zombie_child", "weight": 15 },

diff --git a/data/json/monsters/feral_humans.json b/data/json/monsters/feral_humans.json
@@ -782,7 +782,7 @@
     "id": "mon_feral_swimmer_kickboard",
     "type": "MONSTER",
     "name": { "str": "feral swimmer" },
-    "description": "Clad in swimwear and with a swimming kickboard in hand, this once normal person is now a bloodthirsty maniac, capable of swimming behind its victims and drown them with a smile on its face.",
+    "description": "Clad in swimwear and with a stick in hand, this once normal person is now a bloodthirsty maniac.",
     "default_faction": "zombie",
     "looks_like": "chud",
     "bodytype": "human",
@@ -811,24 +811,7 @@
     "death_drops": "feral_swimmer_death_drops_kickboard",
     "zombify_into": "mon_zombie_swimmer_base",
     "anger_triggers": [ "FRIEND_DIED", "FRIEND_ATTACKED", "HURT" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1", "SWIMS" ]
-  },
-  {
-    "id": "mon_feral_diver_knife",
-    "type": "MONSTER",
-    "name": { "str": "feral diver" },
-    "description": "Once an avid diver, this masked maniac now follows its prey until the deepest of the oceans, wielding a dive knife with which to murder them.",
-    "copy-from": "mon_feral_swimmer_kickboard",
-    "color": "blue",
-    "melee_dice": 2,
-    "melee_dice_sides": 5,
-    "melee_damage": [ { "damage_type": "cut", "amount": 4 } ],
-    "dodge": 2,
-    "weakpoint_sets": [ "wps_humanoid_body", "wps_humanoid_light_armor" ],
-    "extend": { "flags": [ "WATER_CAMOUFLAGE", "NO_BREATHE" ] },
-    "delete": { "flags": [ "SMELLS" ] },
-    "death_drops": "feral_diver_death_drops_knife",
-    "armor": { "bash": 2, "cut": 1, "bullet": 1 }
+    "flags": [ "SEES", "HEARS", "SMELLS", "WARM", "BASHES", "GROUP_BASH", "HUMAN", "CAN_OPEN_DOORS", "PATH_AVOID_DANGER_1" ]
   },
   {
     "id": "mon_feral_sailor_wrench",