Beaver audit

data/json/harvest.json

@@ -2352,6 +2352,18 @@
     "copy-from": "mammal_small_fur",
     "extend": { "entries": [ { "drop": "skull_beaver", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 } ] }
   },
+  {
+    "id": "beaver_with_skull_fur_mutant",
+    "type": "harvest",
+    "copy-from": "mutant_mammal_fur",
+    "extend": { "entries": [ { "drop": "skull_beaver_huge", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 } ] }
+  },
+  {
+    "id": "beaver_with_skull_feather_mutant",
+    "type": "harvest",
+    "copy-from": "mutant_bird_flightless",
+    "extend": { "entries": [ { "drop": "skull_beaver", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 } ] }
+  },
   {
     "id": "dog_triclopean_with_skull",
     "type": "harvest",

data/json/items/resources/bone.json

@@ -291,6 +291,14 @@
     "volume": "2 L",
     "longest_side": "16 cm"
   },
+  {
+    "type": "GENERIC",
+    "id": "skull_beaver_huge",
+    "name": { "str": "dambreaker skull" },
+    "description": "A skull of an abnormally large mutant beaver.",
+    "copy-from": "skull_beaver",
+    "proportional": { "volume": 2.5, "weight": 2.5, "longest_side": 1.75 }
+  },
   {
     "type": "GENERIC",
     "id": "skull_pig",

data/json/monster_factions.json

@@ -54,7 +54,7 @@
     "type": "MONSTER_FACTION",
     "name": "zombie_aquatic",
     "base_faction": "zombie",
-    "hate": [ "aquatic_predator", "kraken", "fish_large", "fish_mutant_passive" ]
+    "hate": [ "aquatic_predator", "kraken", "fish_large", "fish_mutant_passive", "beaver" ]
   },
   {
     "type": "MONSTER_FACTION",
@@ -281,6 +281,13 @@
     "base_faction": "herbivore",
     "by_mood": [ "herbivore" ]
   },
+  {
+    "type": "MONSTER_FACTION",
+    "name": "beaver",
+    "base_faction": "herbivore",
+    "neutral": [ "herbivore" ],
+    "by_mood": [ "zombie_aquatic" ]
+  },
   {
     "type": "MONSTER_FACTION",
     "name": "bear",
@@ -320,7 +327,8 @@
   {
     "type": "MONSTER_FACTION",
     "name": "pig",
-    "base_faction": "herbivore"
+    "base_faction": "herbivore",
+    "neutral": [ "herbivore" ]
   },
   {
     "type": "MONSTER_FACTION",

data/json/monstergroups/mammal.json

@@ -167,7 +167,7 @@
     "type": "monstergroup",
     "monsters": [
       { "group": "GROUP_MOOSE_NORMAL", "weight": 19 },
-      { "group": "GROUP_TUSKED_MOOSE", "weight": 1, "starts": "732 days" }
+      { "group": "GROUP_TUSKED_MOOSE", "weight": 1, "starts": "958 days" }
     ]
   },
   {
@@ -195,8 +195,17 @@
     "//": "Not doing the whole weird thing with timers and weight halving for babies as the groups above me did. I have no idea what's that hoping to accomplish and nobody else seems to either.",
     "monsters": [
       { "monster": "mon_coyote", "weight": 38 },
-      { "monster": "mon_coyote_mutant_shark", "weight": 1, "starts": "272 days" },
-      { "monster": "mon_coyote_mutant_venom", "weight": 1, "starts": "272 days" }
+      { "monster": "mon_coyote_mutant_shark", "weight": 1, "starts": "270 days" },
+      { "monster": "mon_coyote_mutant_venom", "weight": 1, "starts": "270 days" }
+    ]
+  },
+  {
+    "name": "GROUP_BEAVER",
+    "type": "monstergroup",
+    "monsters": [
+      { "monster": "mon_beaver", "weight": 38 },
+      { "monster": "mon_beaver_mutant_avian", "weight": 1, "starts": "730 days" },
+      { "monster": "mon_beaver_mutant_huge", "weight": 1, "starts": "730 days" }
     ]
   },
   {

data/json/monstergroups/misc.json

@@ -515,7 +515,7 @@
     "//": "Special group with hardcoded reference in basecamp::hunting_results. Does not actually spawn anywhere, used solely to determine returns from camp hunting mission.",
     "//2": "This group always has a chance of being the result, regardless of mission type.",
     "monsters": [
-      { "monster": "mon_beaver", "weight": 10 },
+      { "group": "GROUP_BEAVER", "weight": 10 },
       { "monster": "mon_fox_red", "weight": 10 },
       { "monster": "mon_fox_gray", "weight": 10 },
       { "monster": "mon_mink", "weight": 5 },

data/json/monstergroups/mutant_vertebrate_reproduction.json

@@ -13,6 +13,15 @@
       { "monster": "mon_coyote_pup_mutant_venom", "weight": 1 }
     ]
   },
+  {
+    "name": "REPRODUCTION_MUT_BEAVER",
+    "type": "monstergroup",
+    "monsters": [
+      { "monster": "mon_beaver_kit", "weight": 38 },
+      { "monster": "mon_beaver_mutant_avian_kit", "weight": 1 },
+      { "monster": "mon_beaver_mutant_huge_kit", "weight": 1 }
+    ]
+  },
   {
     "name": "REPRODUCTION_MUT_RATTLESNAKE",
     "type": "monstergroup",

data/json/monstergroups/wilderness.json

@@ -285,7 +285,7 @@
     "default": "mon_null",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_beaver", "weight": 8, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
+      { "group": "GROUP_BEAVER", "weight": 8, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
       {
         "monster": "mon_mink",
         "weight": 3,
@@ -690,7 +690,7 @@
         "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
       },
       { "monster": "mon_mink", "weight": 3, "pack_size": [ 1, 2 ], "conditions": [ "SPRING", "SUMMER", "AUTUMN" ] },
-      { "monster": "mon_beaver", "weight": 8, "pack_size": [ 1, 3 ] }
+      { "group": "GROUP_BEAVER", "weight": 8, "pack_size": [ 1, 3 ] }
     ]
   }
 ]

data/json/monsters/mammal.json

@@ -144,32 +144,58 @@
     "type": "MONSTER",
     "name": { "str": "beaver" },
     "description": "The North American beaver, the continent's largest rodent.  Its paddle-shaped tail helps ferry it through the water, and its prominent teeth can chew through wood, which it uses to build dam-like nests in lakes and streams.",
-    "default_faction": "herbivore",
+    "default_faction": "beaver",
     "bodytype": "bear",
     "categories": [ "WILDLIFE" ],
     "species": [ "MAMMAL" ],
-    "volume": "20250 ml",
-    "weight": "20250 g",
-    "hp": 16,
-    "speed": 90,
+    "volume": "20 L",
+    "weight": "20 kg",
+    "hp": 31,
+    "speed": 80,
     "material": [ "flesh" ],
     "symbol": "r",
     "color": "brown",
-    "aggression": -35,
-    "morale": 15,
-    "aggro_character": false,
+    "aggression": 5,
+    "morale": 20,
     "melee_dice": 1,
     "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
+    "melee_damage": [ { "damage_type": "cut", "amount": 9 } ],
     "dodge": 2,
     "harvest": "beaver_with_skull",
     "dissect": "dissect_mouse_sample_small",
     "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ],
-    "anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
-    "fear_triggers": [ "SOUND" ],
+    "reproduction": { "baby_type": { "baby_monster_group": "REPRODUCTION_MUT_BEAVER" }, "baby_count": 4, "baby_timer": 142 },
+    "//": "128 days gestation period + 14 days average to wean the young.",
+    "baby_flags": [ "SPRING" ],
+    "anger_triggers": [ "PLAYER_CLOSE", "PLAYER_NEAR_BABY" ],
+    "fear_triggers": [ "HURT", "SOUND", "FRIEND_ATTACKED", "FRIEND_DIED" ],
     "zombify_into": "mon_zombeaver",
     "special_attacks": [ { "type": "bite", "cooldown": 15 } ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "WATER_CAMOUFLAGE" ]
+    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM", "WATER_CAMOUFLAGE", "CORNERED_FIGHTER" ]
+  },
+  {
+    "id": "mon_beaver_kit",
+    "type": "MONSTER",
+    "name": { "str": "beaver kit" },
+    "description": "A small baby beaver.",
+    "copy-from": "mon_beaver",
+    "volume": "600 ml",
+    "weight": "600 g",
+    "hp": 1,
+    "speed": 40,
+    "aggression": -20,
+    "morale": 0,
+    "melee_dice_sides": 1,
+    "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
+    "dodge": 3,
+    "harvest": "mammal_tiny",
+    "dissect": "dissect_mouse_sample_single",
+    "upgrades": { "age_grow": 730, "into": "mon_beaver" },
+    "//": "2 years to reach independence.",
+    "zombify_into": "",
+    "anger_triggers": [  ],
+    "extend": { "flags": [ "NO_BREED", "SMALL_HIDER" ], "fear_triggers": [ "PLAYER_CLOSE" ] },
+    "delete": { "flags": [ "CORNERED_FIGHTER" ], "special_attacks": [ "bite" ] }
   },
   {
     "id": "mon_black_rat",

data/json/monsters/mutant_mammal.json

@@ -63,65 +63,49 @@
     "type": "MONSTER",
     "name": { "str": "dambreaker" },
     "description": "This mutated beaver is almost double its normal size, and its back is covered with tough-looking bristles.",
-    "default_faction": "herbivore",
-    "bodytype": "bear",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "MAMMAL" ],
-    "volume": "40000 ml",
-    "weight": "40000 g",
-    "hp": 32,
-    "speed": 90,
-    "material": [ "flesh" ],
-    "symbol": "r",
-    "color": "brown",
-    "looks_like": "mon_beaver",
-    "aggression": -10,
-    "morale": 20,
-    "aggro_character": false,
+    "copy-from": "mon_beaver",
+    "hp": 71,
     "melee_dice": 2,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
-    "dodge": 2,
-    "harvest": "mutant_mammal_fur",
+    "harvest": "beaver_with_skull_fur_mutant",
     "dissect": "dissect_mouse_sample_large",
-    "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ],
-    "anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
-    "fear_triggers": [ "SOUND" ],
-    "zombify_into": "mon_meat_cocoon_small",
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ],
-    "armor": { "cut": 4 }
+    "reproduction": { "baby_type": { "baby_monster": "mon_beaver_mutant_huge_kit" }, "baby_count": 4, "baby_timer": 142 },
+    "armor": { "bash": 6, "cut": 4 },
+    "proportional": { "volume": 2.5, "weight": 2.5 },
+    "extend": { "anger_triggers": [ "HURT" ] },
+    "delete": { "flags": [ "WATER_CAMOUFLAGE" ], "fear_triggers": [ "HURT" ] }
+  },
+  {
+    "id": "mon_beaver_mutant_huge_kit",
+    "type": "MONSTER",
+    "name": { "str": "dambreaker kit" },
+    "description": "An unnaturally large baby beaver with an array of bristles covering its back.",
+    "copy-from": "mon_beaver_kit",
+    "hp": 4,
+    "harvest": "mutant_animal_noskin",
+    "upgrades": { "age_grow": 730, "into": "mon_beaver_mutant_huge" },
+    "proportional": { "volume": 2.5, "weight": 2.5 }
   },
   {
     "id": "mon_beaver_mutant_avian",
     "type": "MONSTER",
     "name": { "str": "feaver" },
     "description": "This mutant beaver's body is covered with brightly-colored feathers in a particularly eyecatching pattern.  It must have been very lucky not to have been caught by a predator before now.",
-    "default_faction": "herbivore",
-    "bodytype": "bear",
-    "categories": [ "WILDLIFE" ],
-    "species": [ "MAMMAL" ],
-    "volume": "20000 ml",
-    "weight": "20000 g",
-    "hp": 12,
-    "speed": 110,
-    "material": [ "flesh" ],
-    "symbol": "r",
-    "color": "brown",
-    "looks_like": "mon_beaver",
-    "aggression": -50,
-    "morale": 5,
-    "aggro_character": false,
-    "melee_dice": 1,
-    "melee_dice_sides": 6,
-    "melee_damage": [ { "damage_type": "cut", "amount": 6 } ],
-    "dodge": 3,
-    "harvest": "mutant_bird_flightless",
+    "copy-from": "mon_beaver",
+    "color": "blue",
+    "harvest": "beaver_with_skull_feather_mutant",
     "dissect": "dissect_flying_rodent_small",
-    "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology" ],
-    "anger_triggers": [ "PLAYER_CLOSE", "HURT" ],
-    "fear_triggers": [ "SOUND" ],
-    "zombify_into": "mon_meat_cocoon_tiny",
-    "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER", "SWIMS", "WARM" ]
+    "reproduction": { "baby_type": { "baby_monster": "mon_beaver_mutant_avian_kit" }, "baby_count": 4, "baby_timer": 142 },
+    "delete": { "flags": [ "WATER_CAMOUFLAGE" ] }
+  },
+  {
+    "id": "mon_beaver_mutant_avian_kit",
+    "type": "MONSTER",
+    "name": { "str": "bald beaver kit" },
+    "description": "This beaver kit lacks any fur covering its body, instead looking reminiscent of a plucked chicken.",
+    "copy-from": "mon_beaver_kit",
+    "harvest": "mutant_animal_noskin",
+    "dissect": "dissect_flying_rodent_small",
+    "upgrades": { "age_grow": 730, "into": "mon_beaver_mutant_avian" }
   },
   {
     "id": "mon_coyote_mutant_shark",