Obsolete several monsters: poor references & non-native fauna (Clever…

…Raven#64960) * Blinky is fucking DEAD * lint the linty * mapgen hurting juice * finished? * oopsie * applied suggested changes * I hate mapgen
tenmillimaster · Apr 19, 2023 · 4309094 · 4309094
1 parent e264dce
commit 4309094
Show file tree

Hide file tree

Showing 18 changed files with 92 additions and 358 deletions.
diff --git a/data/json/mapgen/cave.json b/data/json/mapgen/cave.json
@@ -377,77 +377,6 @@
       "monster": { "B": { "monster": "mon_cougar" } }
     }
   },
-  {
-    "type": "mapgen",
-    "method": "json",
-    "om_terrain": [ "cave" ],
-    "weight": 50,
-    "object": {
-      "rotation": [ 0, 3 ],
-      "predecessor_mapgen": "forest_thick",
-      "rows": [
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "                        ",
-        "     %%%%%%%%%%%%%%%    ",
-        "    %%||||||||||||||%   ",
-        "    %|||,,,,,,||||||%   ",
-        "    %|||,,|||,,|||||%   ",
-        "    %|||,,||||,,||||%   ",
-        "    %||,,,|||||,,|||%   ",
-        "    %|@,,,|||||,,|||%   ",
-        "    %||||||,,,,,q|||%   ",
-        "    %|||||,,||||||||%   ",
-        "    %%|||;;||||||||%%   ",
-        "     %;;|;;;;;%%%%%%    ",
-        "      ~!?~~!RR?R!       ",
-        "     RR~~RR#?!~~R       ",
-        "    ! ??!~~RR~?!!       ",
-        "     ~#RR?RR?~R#?       ",
-        "     !?RR~~~R!RRR       ",
-        "     RR~?R!~~?          ",
-        "      !                 ",
-        "                        "
-      ],
-      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
-      "terrain": {
-        "|": "t_rock",
-        "%": [ "t_rock", "t_region_groundcover_forest" ],
-        ";": "t_rock_floor_no_roof",
-        "!": "t_rock_floor_no_roof",
-        "?": "t_rock_floor_no_roof",
-        "#": "t_rock_floor_no_roof",
-        "~": "t_rock_floor_no_roof",
-        "@": "t_rock_floor",
-        ",": "t_rock_floor",
-        "q": "t_rock_floor",
-        "R": "t_rock_floor_no_roof"
-      },
-      "furniture": { "R": [ [ "f_boulder_small", 1 ], [ "f_null", 10 ] ] },
-      "item": {
-        "#": [
-          { "item": "helmet_plate", "chance": 100 },
-          { "item": "boots_plate", "chance": 100 },
-          { "item": "chainmail_arms", "chance": 100 },
-          { "item": "gloves_plate", "chance": 100 },
-          { "item": "chainmail_legs", "chance": 100 },
-          { "item": "chainmail_hauberk", "chance": 100 },
-          { "item": "longsword", "chance": 100 },
-          { "item": "corpse", "chance": 100 }
-        ],
-        "@": { "item": "mininuke", "chance": 100 },
-        "~": { "item": "bone", "chance": 50, "repeat": [ 1, 3 ] }
-      },
-      "fields": {
-        "!": { "field": "fd_gibs_flesh", "intensity": 2, "age": 10 },
-        "?": { "field": "fd_blood", "intensity": 2, "age": 10 },
-        "#": { "field": "fd_blood", "intensity": 3, "age": 10 }
-      },
-      "monster": { "q": { "monster": "mon_rabbit_dreadful" } }
-    }
-  },
   {
     "type": "mapgen",
     "method": "json",
@@ -546,7 +475,7 @@
         "...    ... .......  ....",
         "... ..  ..  ..   ..  ...",
         "... ...  ..       ..  ..",
-        "... ....  ...  M   .. ..",
+        "... ....  ...      .. ..",
         "...  ....  ..      .. ..",
         "....  ....  ..    ..  ..",
         ".....  ....  ......  ...",
@@ -567,8 +496,7 @@
         "............>..........."
       ],
       "terrain": { ".": "t_soil", " ": "t_dirt_underground", ">": "t_slope_up" },
-      "furniture": {  },
-      "monster": { "M": { "monster": "mon_nakedmolerat_giant" }, " ": { "monster": "mon_nakedmolerat_giant", "chance": 2 } }
+      "furniture": {  }
     }
   },
   {
@@ -788,7 +716,7 @@
         ".%%%%||||rr   rr||||%%%.",
         ".%%%%||||rr   rr||||%%%.",
         ".%%%%||||       ||||%%%.",
-        ".%%%%||||   K   ||||%%%.",
+        ".%%%%||||       ||||%%%.",
         ".%%%%||||       ||||%%%.",
         ".%%%%||||rr   rr||||%%%.",
         "..%%%||||rr   rr||||%%%.",
@@ -809,7 +737,7 @@
         "<": "t_slope_up"
       },
       "furniture": {  },
-      "monster": { "K": { "monster": "mon_rat_king" }, "r": { "monster": "mon_sewer_rat" } },
+      "monster": { "r": { "monster": "mon_sewer_rat" } },
       "items": { "l": { "item": "gobag_contents", "chance": 75 } }
     }
   },

diff --git a/data/json/mapgen/lab/lab_floorplans_1side.json b/data/json/mapgen/lab/lab_floorplans_1side.json
@@ -301,14 +301,7 @@
     "object": {
       "mapgensize": [ 24, 24 ],
       "place_rubble": [ { "x": 11, "y": 4, "items": true }, { "x": 13, "y": 11, "items": true }, { "x": 12, "y": 13, "items": true } ],
-      "place_monster": [
-        {
-          "monster": [ "mon_zombie_hulk", "mon_skeleton_hulk", "mon_nakedmolerat_giant" ],
-          "x": [ 11, 12 ],
-          "y": [ 6, 22 ],
-          "chance": 90
-        }
-      ],
+      "place_monster": [ { "monster": [ "mon_zombie_hulk", "mon_skeleton_hulk" ], "x": [ 11, 12 ], "y": [ 6, 22 ], "chance": 90 } ],
       "place_loot": [ { "group": "everyday_corpse", "x": [ 10, 13 ], "y": [ 1, 3 ], "repeat": 2 } ],
       "place_fields": [
         { "field": "fd_blood", "x": [ 10, 13 ], "y": [ 1, 3 ], "repeat": [ 3, 5 ] },

diff --git a/data/json/monstergroups/fish.json b/data/json/monstergroups/fish.json
@@ -253,7 +253,6 @@
         "conditions": [ "DAWN", "DUSK" ],
         "pack_size": [ 1, 3 ]
       },
-      { "monster": "mon_fish_blinky", "weight": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       {
         "monster": "mon_dragonfly_naiad",
         "weight": 10,

diff --git a/data/json/monstergroups/lab.json b/data/json/monstergroups/lab.json
@@ -50,7 +50,6 @@
       { "monster": "mon_manhack", "weight": 200, "cost_multiplier": 0 },
       { "monster": "mon_manhack", "weight": 45, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
       { "monster": "mon_mutant_experimental", "weight": 50, "cost_multiplier": 3 },
-      { "monster": "mon_nakedmolerat_giant", "weight": 45, "cost_multiplier": 3 },
       { "monster": "mon_skitterbot", "weight": 85, "cost_multiplier": 0 },
       { "monster": "mon_skitterbot", "weight": 85, "cost_multiplier": 0, "pack_size": [ 2, 3 ] },
       { "monster": "mon_skitterbot", "weight": 1, "cost_multiplier": 0, "pack_size": [ 8, 12 ] },

diff --git a/data/json/monstergroups/misc.json b/data/json/monstergroups/misc.json
@@ -83,7 +83,6 @@
     "name": "GROUP_CHUD",
     "monsters": [
       { "monster": "mon_chud", "weight": 875, "cost_multiplier": 0 },
-      { "monster": "mon_one_eye", "weight": 90, "cost_multiplier": 0 },
       { "monster": "mon_crawler", "weight": 35, "cost_multiplier": 0 }
     ]
   },
@@ -96,14 +95,6 @@
       { "monster": "mon_woodlouse", "weight": 300, "pack_size": [ 1, 3 ] },
       { "monster": "mon_slug_small", "weight": 180, "ends": "180 hours" },
       { "monster": "mon_slug_giant", "weight": 180, "starts": "180 hours" },
-      { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 2, "ends": "180 hours" },
-      {
-        "monster": "mon_nakedmolerat_giant",
-        "weight": 100,
-        "cost_multiplier": 2,
-        "pack_size": [ 1, 2 ],
-        "starts": "180 hours"
-      },
       { "monster": "mon_spider_cellar_small", "weight": 300, "pack_size": [ 1, 3 ], "ends": "14 days" },
       { "group": "GROUP_SPIDER_CELLAR", "weight": 300, "pack_size": [ 2, 5 ], "starts": "14 days", "ends": "28 days" },
       {
@@ -146,7 +137,6 @@
     "monsters": [
       { "monster": "mon_chud", "weight": 90 },
       { "monster": "mon_chud", "weight": 400, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_one_eye", "weight": 10 },
       {
         "monster": "mon_zombie_survivor",
         "weight": 100,
@@ -474,7 +464,7 @@
       { "monster": "mon_zombear" },
       { "monster": "mon_zoose" },
       { "monster": "mon_zombull" },
-      { "monster": "mon_zeindeer" },
+      { "monster": "mon_zeindeer", "event": "christmas" },
       { "monster": "mon_zombie_medical_regenerating" },
       { "monster": "mon_zombie_brute_winged" },
       { "monster": "mon_spawn_raptor" },
@@ -492,7 +482,6 @@
     "is_animal": true,
     "monsters": [
       { "monster": "mon_bat", "weight": 600, "cost_multiplier": 5, "pack_size": [ 6, 32 ] },
-      { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 3 },
       { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 },
       { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
       { "monster": "mon_stag_beetle_larva", "freq": 40, "cost_multiplier": 5 },

diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
@@ -8,7 +8,6 @@
       { "group": "GROUP_BEARS", "weight": 100, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       { "monster": "mon_cougar", "weight": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_mutant_experimental", "weight": 25, "cost_multiplier": 3 },
-      { "monster": "mon_nakedmolerat_giant", "weight": 100, "cost_multiplier": 3 },
       { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 },
       { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
       { "monster": "mon_stag_beetle_larva", "weight": 40, "cost_multiplier": 5 }
@@ -127,7 +126,7 @@
       { "monster": "mon_chipmunk", "weight": 30, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_cougar", "weight": 1, "cost_multiplier": 3 },
       { "group": "GROUP_DEERS", "weight": 4, "cost_multiplier": 2, "pack_size": [ 1, 5 ] },
-      { "group": "GROUP_REINDEERS", "weight": 3, "cost_multiplier": 3, "pack_size": [ 2, 6 ] },
+      { "group": "GROUP_REINDEERS", "weight": 3, "cost_multiplier": 3, "pack_size": [ 2, 6 ], "event": "christmas" },
       { "group": "GROUP_STRAY_DOGS", "weight": 6, "cost_multiplier": 25, "pack_size": [ 1, 6 ] },
       { "monster": "mon_fox_gray", "weight": 1, "cost_multiplier": 0 },
       { "monster": "mon_fox_red", "weight": 1, "cost_multiplier": 0 },
@@ -235,13 +234,7 @@
       { "monster": "mon_zougar", "weight": 2, "cost_multiplier": 10 },
       { "monster": "mon_zolf", "weight": 2, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
       { "monster": "mon_zombear", "weight": 1, "cost_multiplier": 10 },
-      {
-        "monster": "mon_zeindeer",
-        "weight": 1,
-        "cost_multiplier": 15,
-        "pack_size": [ 2, 5 ],
-        "conditions": [ "AUTUMN", "WINTER" ]
-      },
+      { "monster": "mon_zeindeer", "weight": 1, "cost_multiplier": 15, "pack_size": [ 2, 5 ], "event": "christmas" },
       { "monster": "mon_zombie_dog", "weight": 1, "cost_multiplier": 2 },
       { "monster": "mon_zombie_horse", "weight": 1, "cost_multiplier": 15, "pack_size": [ 1, 4 ] },
       { "monster": "mon_zoose", "weight": 1, "cost_multiplier": 10 },
@@ -324,7 +317,6 @@
       { "monster": "mon_fish_bluegill", "weight": 10, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_fish_whitefish", "weight": 10, "cost_multiplier": 2, "pack_size": [ 4, 6 ] },
       { "monster": "mon_fish_pickerel", "weight": 6, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_fish_blinky", "weight": 5, "cost_multiplier": 3, "pack_size": [ 1, 3 ] },
       { "monster": "mon_dragonfly_naiad", "weight": 10, "cost_multiplier": 2, "ends": "7 days" },
       {
         "monster": "mon_dragonfly_naiad",

diff --git a/data/json/monsters/fish.json b/data/json/monsters/fish.json
@@ -829,33 +829,6 @@
     "description": "A minuscule half-translucent crustacean larva.  Impossible to identify which species it belongs to.",
     "bodytype": "crab"
   },
-  {
-    "id": "mon_fish_blinky",
-    "type": "MONSTER",
-    "name": { "str": "Blinky", "str_pl": "Blinkies" },
-    "description": "A strange three-eyed fish.",
-    "default_faction": "fish",
-    "bodytype": "fish",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "FISH" ],
-    "volume": "30 L",
-    "weight": "40750 g",
-    "hp": 20,
-    "speed": 150,
-    "material": [ "flesh" ],
-    "symbol": "f",
-    "color": "white",
-    "aggression": -60,
-    "morale": 5,
-    "melee_dice": 1,
-    "melee_dice_sides": 4,
-    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "luminance": 5,
-    "fear_triggers": [ "PLAYER_CLOSE", "SOUND" ],
-    "harvest": "fish_small",
-    "dissect": "dissect_fish_sample_small",
-    "flags": [ "FISHABLE", "SEES", "SMELLS", "SWIMS", "AQUATIC", "WATER_CAMOUFLAGE" ]
-  },
   {
     "id": "mon_fish_eel",
     "type": "MONSTER",

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -2307,56 +2307,6 @@
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE" ],
     "flags": [ "SEES", "SMELLS", "HEARS", "WARM", "SWIMS", "ANIMAL", "PATH_AVOID_DANGER_1" ]
   },
-  {
-    "id": "mon_nakedmolerat_giant",
-    "type": "MONSTER",
-    "name": { "str": "gigantic naked mole-rat" },
-    "description": "A huge, rumbling mutated mass of wrinkly, nearly translucent skin that has been toughened by constant tunneling.  Its hide is riddled with giant scabs, as a pair of incisors the size of an industrial excavator's buckets gnash constantly and several car-length whiskers twitch in the air.  It regularly makes high-pitched chirps as it roams around.",
-    "default_faction": "molerat",
-    "bodytype": "pig",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "MAMMAL" ],
-    "diff": 2,
-    "volume": "200000 ml",
-    "weight": "200 kg",
-    "hp": 120,
-    "speed": 80,
-    "material": [ "flesh" ],
-    "symbol": "M",
-    "color": "pink",
-    "aggression": -5,
-    "morale": 40,
-    "melee_skill": 4,
-    "melee_dice": 4,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 10 } ],
-    "dodge": 1,
-    "armor_bash": 5,
-    "armor_cut": 2,
-    "armor_bullet": 2,
-    "armor_elec": 1,
-    "vision_day": 0,
-    "vision_night": 0,
-    "harvest": "mutant_mammal_leather",
-    "dissect": "dissect_subterranean_rodent_large",
-    "families": [ "prof_intro_biology" ],
-    "special_attacks": [
-      [ "SHRIEK_ALERT", 10 ],
-      [ "SHRIEK_STUN", 1 ],
-      {
-        "type": "bite",
-        "cooldown": 6,
-        "effects": [ { "id": "tetanus", "chance": 5, "duration": 2, "permanent": true } ]
-      },
-      [ "impale", 10 ]
-    ],
-    "anger_triggers": [ "HURT", "SOUND", "STALK" ],
-    "fear_triggers": [ "FIRE" ],
-    "regenerates": 10,
-    "regen_morale": true,
-    "flags": [ "PUSH_MON", "BORES", "CAN_DIG", "HEARS", "KEENNOSE", "PATH_AVOID_DANGER_1", "SMELLS", "WARM" ],
-    "//": "Reinsert GOODHEARING when z-level tunneling is possible."
-  },
   {
     "id": "mon_opossum",
     "type": "MONSTER",
@@ -2541,33 +2491,6 @@
     "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE" ]
   },
-  {
-    "id": "mon_rat_king",
-    "type": "MONSTER",
-    "name": { "str": "rat king" },
-    "description": "A towering swarm of mutated rats, their tails knotted together in a filthy mass.  A fetid stench flows from its filthy presence.",
-    "default_faction": "rat",
-    "species": [ "MAMMAL" ],
-    "diff": 10,
-    "volume": "81500 ml",
-    "weight": "81500 g",
-    "hp": 220,
-    "speed": 40,
-    "material": [ "flesh" ],
-    "symbol": "&",
-    "color": "dark_gray",
-    "aggression": 10,
-    "morale": 100,
-    "melee_skill": 4,
-    "melee_dice": 1,
-    "melee_dice_sides": 3,
-    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
-    "harvest": "mammal_tiny",
-    "dissect": "dissect_rat_sample_large",
-    "families": [ "prof_intro_biology" ],
-    "special_attacks": [ [ "RATKING", 3 ] ],
-    "death_function": { "effect": { "id": "death_ratking" }, "message": "Rats suddenly swarm into view." }
-  },
   {
     "id": "mon_sewer_rat",
     "type": "MONSTER",

diff --git a/data/json/monsters/mutant.json b/data/json/monsters/mutant.json
@@ -306,38 +306,5 @@
     "zombify_into": "mon_meat_cocoon_large",
     "delete": { "flags": [ "HIT_AND_RUN" ], "fear_triggers": [ "FIRE" ] },
     "extend": { "flags": [ "SMALLSLUDGETRAIL", "SLUDGEPROOF", "NOHEAD", "STUN_IMMUNE", "FIREPROOF" ] }
-  },
-  {
-    "id": "mon_one_eye",
-    "type": "MONSTER",
-    "name": { "str": "cyclopean" },
-    "description": "A relatively humanoid mutant with purple hair and a grapefruit-sized bloodshot eye.",
-    "default_faction": "mutant",
-    "bodytype": "human",
-    "species": [ "MUTANT" ],
-    "volume": "62500 ml",
-    "weight": "81500 g",
-    "hp": 80,
-    "speed": 130,
-    "material": [ "flesh" ],
-    "symbol": "@",
-    "color": "light_red",
-    "aggression": 30,
-    "morale": 30,
-    "melee_skill": 5,
-    "melee_dice": 2,
-    "melee_dice_sides": 4,
-    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
-    "armor_elec": 1,
-    "dodge": 5,
-    "harvest": "mutant_human",
-    "dissect": "dissect_human_sample_single",
-    "fear_triggers": [ "FIRE" ],
-    "death_drops": {
-      "subtype": "collection",
-      "groups": [ [ "subway", 40 ], [ "sewer", 20 ], [ "trash", 5 ], [ "bedroom", 1 ], [ "dresser", 5 ], [ "ammo", 18 ] ]
-    },
-    "zombify_into": "mon_meat_cocoon_small",
-    "flags": [ "SEES", "HEARS", "WARM", "BASHES", "GROUP_BASH", "HUMAN" ]
   }
 ]