[MoM] Update mutated animals to match vanilla changes (#77431)

* Create comestible_overrides.json * Fix typo * Update spawn timers * Add pigeon egg * Add pigeon eggs * Add various baby psychic animals * Add start delay timers * correct typo * Fix typo * Add feral pigeon passenger egg * Update data/mods/MindOverMatter/monstergroups/monstergroups_edited.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update data/mods/MindOverMatter/monstergroups/monstergroups_new.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Fixes --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Nov 1, 2024 · 9d69c81 · 9d69c81
1 parent 60cb55f
commit 9d69c81
Show file tree

Hide file tree

Showing 7 changed files with 193 additions and 119 deletions.
diff --git a/data/mods/MindOverMatter/items/comestible_overrides.json b/data/mods/MindOverMatter/items/comestible_overrides.json
@@ -0,0 +1,16 @@
+[
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_chicken",
+    "copy-from": "egg_chicken",
+    "name": { "str": "chicken egg" },
+    "rot_spawn": { "group": "GROUP_EGG_CHICKEN", "chance": 70 }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_pigeon",
+    "name": { "str": "feral pigeon egg" },
+    "copy-from": "egg_pigeon",
+    "rot_spawn": { "group": "GROUP_EGG_PIGEON" }
+  }
+]
diff --git a/data/mods/MindOverMatter/items/comestibles.json b/data/mods/MindOverMatter/items/comestibles.json
@@ -319,5 +319,12 @@
     "flags": [ "FREEZERBURN", "INEDIBLE" ],
     "vitamins": [ [ "vitC", "366 mg" ], [ "iron", "35800 μg" ], [ "calcium", "32300 μg" ] ],
     "melee_damage": { "bash": 2 }
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_pigeon_passenger",
+    "name": { "str": "feral pigeon egg" },
+    "copy-from": "egg_pigeon",
+    "rot_spawn": { "monster": "mon_pigeon_passenger", "chance": 70 }
   }
 ]
diff --git a/data/mods/MindOverMatter/monstergroups/monstergroups_edited.json b/data/mods/MindOverMatter/monstergroups/monstergroups_edited.json
@@ -181,30 +181,37 @@
   {
     "name": "GROUP_BEARS",
     "type": "monstergroup",
-    "monsters": [ { "monster": "mon_bandersnatch", "weight": 20, "starts": "21 days", "cost_multiplier": 5 } ]
+    "monsters": [ { "monster": "mon_bandersnatch", "weight": 20, "starts": "2 days", "cost_multiplier": 5 } ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_CAVE",
-    "monsters": [ { "monster": "mon_hidebehind", "weight": 10, "starts": "21 days", "cost_multiplier": 5 } ]
+    "monsters": [ { "monster": "mon_hidebehind", "weight": 10, "starts": "2 days", "cost_multiplier": 5 } ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_WILDERNESS_FOREST_MAMMAL_WINTER",
     "monsters": [
-      { "monster": "mon_hidebehind", "weight": 1, "starts": "21 days", "cost_multiplier": 10 },
-      { "monster": "mon_psi_gremlin", "weight": 1, "starts": "21 days", "cost_multiplier": 10 }
+      { "monster": "mon_hidebehind", "weight": 1, "starts": "2 days", "cost_multiplier": 10 },
+      { "monster": "mon_psi_gremlin", "weight": 1, "starts": "2 days", "cost_multiplier": 10 }
     ]
   },
   {
     "name": "GROUP_COWS",
     "type": "monstergroup",
-    "monsters": [ { "monster": "mon_hodag", "weight": 10, "starts": "14 days", "cost_multiplier": 8 } ]
+    "monsters": [
+      { "monster": "mon_hodag_calf", "weight": 10, "starts": "7 days", "cost_multiplier": 5 },
+      { "monster": "mon_hodag", "weight": 10, "starts": "180 days", "cost_multiplier": 8 }
+    ]
   },
   {
     "name": "GROUP_COWS_DAIRY",
     "type": "monstergroup",
-    "monsters": [ { "monster": "mon_hodag", "weight": 10, "starts": "14 days", "cost_multiplier": 20 } ]
+    "monsters": [
+      { "monster": "mon_cow_biokinetic", "weight": 10, "starts": "2 days", "cost_multiplier": 5 },
+      { "monster": "mon_hodag_calf", "weight": 10, "starts": "7 days", "cost_multiplier": 5 },
+      { "monster": "mon_hodag", "weight": 10, "starts": "180 days", "cost_multiplier": 20 }
+    ]
   },
   {
     "type": "monstergroup",
@@ -224,8 +231,8 @@
     "default": "mon_null",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_hodag", "weight": 1, "cost_multiplier": 10 },
-      { "monster": "mon_cockatrice", "weight": 5, "starts": "10 days", "cost_multiplier": 10, "pack_size": [ 3, 5 ] }
+      { "monster": "mon_hodag", "weight": 1, "cost_multiplier": 10, "starts": "180 days" },
+      { "monster": "mon_cockatrice", "weight": 5, "starts": "21 days", "cost_multiplier": 10, "pack_size": [ 3, 5 ] }
     ]
   },
   {
@@ -234,31 +241,36 @@
     "default": "mon_null",
     "is_animal": true,
     "monsters": [
-      { "monster": "mon_cockatrice", "weight": 2, "starts": "10 days", "cost_multiplier": 2 },
-      { "monster": "mon_cockatrice", "weight": 10, "starts": "10 days", "cost_multiplier": 10, "pack_size": [ 3, 5 ] }
+      { "monster": "mon_cockatrice", "weight": 2, "starts": "21 days", "cost_multiplier": 2 },
+      { "monster": "mon_cockatrice", "weight": 10, "starts": "21 days", "cost_multiplier": 10, "pack_size": [ 3, 5 ] },
+      { "monster": "mon_pigeon_passenger", "weight": 2, "starts": "21 days", "cost_multiplier": 2 },
+      {
+        "monster": "mon_pigeon_passenger",
+        "weight": 10,
+        "starts": "21 days",
+        "cost_multiplier": 10,
+        "pack_size": [ 3, 5 ]
+      }
     ]
   },
   {
     "type": "monstergroup",
     "name": "GROUP_SAFE",
     "default": "mon_null",
     "is_animal": true,
-    "monsters": [
-      { "monster": "mon_cockatrice", "weight": 2, "starts": "10 days" },
-      { "monster": "mon_psi_gremlin", "weight": 2, "starts": "21 days" }
-    ]
+    "monsters": [ { "monster": "mon_cockatrice", "weight": 2, "starts": "21 days" }, { "monster": "mon_psi_gremlin", "weight": 2 } ]
   },
   {
     "name": "GROUP_STRAY_DOGS",
     "type": "monstergroup",
     "default": "mon_dog",
-    "monsters": [ { "monster": "mon_dire_hound", "weight": 1, "starts": "14 days", "cost_multiplier": 0 } ]
+    "monsters": [ { "monster": "mon_dire_hound", "weight": 1, "starts": "58 days", "cost_multiplier": 0 } ]
   },
   {
     "name": "GROUP_MUTANT_PET_DOGS",
     "type": "monstergroup",
     "default": "mon_dog_mutant_mongrel",
-    "monsters": [ { "monster": "mon_dire_hound", "weight": 1, "starts": "14 days", "cost_multiplier": 0 } ]
+    "monsters": [ { "monster": "mon_dire_hound", "weight": 1, "starts": "58 days", "cost_multiplier": 0 } ]
   },
   {
     "type": "monstergroup",

diff --git a/data/mods/MindOverMatter/monstergroups/monstergroups_new.json b/data/mods/MindOverMatter/monstergroups/monstergroups_new.json
@@ -8,12 +8,11 @@
       { "monster": "mon_hidebehind", "weight": 20 },
       { "monster": "mon_psi_gremlin", "weight": 100 },
       { "monster": "mon_psi_gremlin", "weight": 15, "pack_size": [ 2, 3 ] },
-      { "monster": "mon_cockatrice", "weight": 75 },
-      { "monster": "mon_cockatrice", "weight": 10, "pack_size": [ 3, 5 ] },
-      { "monster": "mon_hodag", "weight": 10 },
+      { "monster": "mon_cockatrice", "weight": 75, "starts": "21 days" },
+      { "monster": "mon_cockatrice", "weight": 10, "pack_size": [ 3, 5 ], "starts": "21 days" },
+      { "monster": "mon_hodag", "weight": 10, "starts": "180 days" },
       { "monster": "mon_bandersnatch", "weight": 5 },
-      { "monster": "mon_fear_hawk", "weight": 10 },
-      { "monster": "mon_cockatrice", "weight": 2, "pack_size": [ 2, 2 ] }
+      { "monster": "mon_fear_hawk", "weight": 10 }
     ]
   },
   {
@@ -112,13 +111,6 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_fear_hawk", "weight": 1000 } ]
   },
-  {
-    "type": "monstergroup",
-    "name": "GROUP_PIGEON_UPGRADE",
-    "default": "mon_pigeon",
-    "//": "pigeon upgrades",
-    "monsters": [ { "monster": "mon_pigeon", "weight": 500 }, { "monster": "mon_pigeon_passenger", "weight": 50 } ]
-  },
   {
     "name": "GROUP_CRYSTAL_FIELD_PSYCHOACTIVE",
     "type": "monstergroup",
@@ -259,10 +251,30 @@
       { "monster": "mon_shoggoth", "weight": 5, "cost_multiplier": 0 }
     ]
   },
+  {
+    "name": "GROUP_REPRODUCTION_COW_MUTANT_BABIES",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cow_calf", "weight": 95 }, { "monster": "mon_hodag_calf", "weight": 95 } ]
+  },
+  {
+    "name": "GROUP_REPRODUCTION_COW_PRE_HODAG_MUTANT_BABIES",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cow_calf", "weight": 75 }, { "monster": "mon_hodag_calf", "weight": 25 } ]
+  },
   {
     "name": "GROUP_EGG_COCKATRICE",
     "type": "monstergroup",
-    "monsters": [ { "monster": "mon_cockatrice_chick", "weight": 5 }, { "monster": "mon_chicken_chick", "weight": 1 } ]
+    "monsters": [ { "monster": "mon_cockatrice_chick", "weight": 100 } ]
+  },
+  {
+    "name": "GROUP_EGG_CHICKEN",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_cockatrice_chick", "weight": 5 }, { "monster": "mon_chicken_chick", "weight": 95 } ]
+  },
+  {
+    "name": "GROUP_EGG_PIGEON",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_pigeon_passenger_chick", "weight": 5 }, { "monster": "mon_pigeon_chick", "weight": 95 } ]
   },
   {
     "name": "GROUP_ALIEN_MEADOW",