Cougar kittens! (#71855)

* Add cougar kittens to the main game * Fix cougar taming * No more cuddly cougar kittens
CleverRaven · Feb 23, 2024 · e4b0939 · e4b0939
1 parent abc0c36
commit e4b0939
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 6 deletions.
diff --git a/data/json/monstergroups/mammal.json b/data/json/monstergroups/mammal.json
@@ -127,6 +127,27 @@
       }
     ]
   },
+  {
+    "name": "GROUP_COUGARS",
+    "type": "monstergroup",
+    "monsters": [
+      { "monster": "mon_cougar", "weight": 150, "cost_multiplier": 2 },
+      {
+        "monster": "mon_cougar_kitten",
+        "weight": 25,
+        "pack_size": [ 1, 2 ],
+        "ends": "31 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
+      {
+        "monster": "mon_cougar_kitten",
+        "weight": 12,
+        "pack_size": [ 1, 2 ],
+        "starts": "31 days",
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      }
+    ]
+  },
   {
     "name": "GROUP_HORSES",
     "type": "monstergroup",

diff --git a/data/json/monstergroups/wilderness.json b/data/json/monstergroups/wilderness.json
@@ -6,7 +6,7 @@
     "monsters": [
       { "monster": "mon_bat", "weight": 600, "cost_multiplier": 5, "pack_size": [ 6, 32 ] },
       { "group": "GROUP_BEARS", "weight": 100, "cost_multiplier": 10, "pack_size": [ 1, 3 ] },
-      { "monster": "mon_cougar", "weight": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
+      { "group": "GROUP_COUGARS", "weight": 100, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_mutant_experimental", "weight": 25, "cost_multiplier": 3 },
       { "monster": "mon_mole_cricket", "weight": 60, "cost_multiplier": 3 },
       { "monster": "mon_woodlouse", "weight": 60, "cost_multiplier": 3, "pack_size": [ 2, 4 ] },
@@ -161,7 +161,7 @@
     "monsters": [
       { "monster": "mon_bobcat", "weight": 7, "cost_multiplier": 2 },
       { "group": "GROUP_BOARS", "weight": 2, "cost_multiplier": 2, "pack_size": [ 1, 4 ] },
-      { "monster": "mon_cougar", "weight": 1, "cost_multiplier": 3 },
+      { "group": "GROUP_COUGARS", "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 ], "event": "christmas" },
       { "monster": "mon_fox_gray", "weight": 1, "cost_multiplier": 0 },

diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -704,15 +704,44 @@
     "vision_night": 10,
     "path_settings": { "max_dist": 10 },
     "special_attacks": [ [ "scratch", 10 ], { "type": "leap", "cooldown": 5, "max_range": 5 } ],
-    "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "FRIEND_ATTACKED" ],
+    "anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT", "PLAYER_CLOSE", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ],
     "fear_triggers": [ "SOUND" ],
     "zombify_into": "mon_zougar",
     "harvest": "cougar_with_skull",
     "dissect": "dissect_feline_sample_small",
     "families": [ "prof_intro_biology", "prof_physiology" ],
+    "reproduction": { "baby_monster": "mon_cougar_kitten", "baby_count": 6, "baby_timer": 92 },
+    "//": "Cougars can breed all year, but mainly do so between January and August, they can have between 1 to 6 kittens at a time.",
+    "baby_flags": [ "SPRING", "SUMMER", "AUTUMN" ],
     "flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN", "KEENNOSE" ],
     "armor": { "bash": 1 }
   },
+  {
+    "id": "mon_cougar_kitten",
+    "type": "MONSTER",
+    "copy-from": "mon_cougar",
+    "looks_like": "mon_cat_kitten",
+    "name": { "str": "cougar kitten" },
+    "description": "A cute and currently defenseless cougar kitten, meowing at its surroundings in search of its mother.  Be careful, these kittens grow quite big and ferocious in just a few months.",
+    "volume": "900 ml",
+    "weight": "1200 g",
+    "hp": 10,
+    "speed": 98,
+    "harvest": "mammal_tiny",
+    "aggression": -25,
+    "morale": -10,
+    "aggro_character": false,
+    "melee_skill": 2,
+    "melee_dice": 1,
+    "melee_dice_sides": 1,
+    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
+    "dodge": 9,
+    "special_attacks": [ { "id": "scratch", "attack_upper": false, "cooldown": 10 } ],
+    "extend": { "flags": [ "NO_BREED" ] },
+    "upgrades": { "age_grow": 180, "into": "mon_cougar" },
+    "//": "Kittens do not have their full fur yet and are really sensitive to cold temperature",
+    "armor": { "cold": 0 }
+  },
   {
     "id": "mon_tiger",
     "type": "MONSTER",

diff --git a/data/mods/Tamable_Wildlife/mammal.json b/data/mods/Tamable_Wildlife/mammal.json
@@ -103,15 +103,22 @@
     "extend": { "flags": [ "CANPLAY" ] }
   },
   {
-    "id": "mon_cougar",
+    "id": "mon_cougar_kitten",
     "type": "MONSTER",
-    "copy-from": "mon_cougar",
-    "name": { "str": "cougar" },
+    "copy-from": "mon_cougar_kitten",
+    "name": { "str": "cougar kitten" },
     "petfood": {
       "food": [ "CATFOOD" ],
       "feed": "The %s seems to tolerate you!  Or maybe it just won't eat you for now.  This is not a housecat.",
       "pet": "The %s softly chuffs as you pet it.  It brushes against you."
     },
+    "extend": { "flags": [ "CANPLAY" ] }
+  },
+  {
+    "id": "mon_cougar",
+    "type": "MONSTER",
+    "copy-from": "mon_cougar",
+    "name": { "str": "cougar" },
     "extend": { "flags": [ "CANPLAY", "PET_MOUNTABLE" ] }
   },
   {