[DinoMod] the sauropods (#2131)

* [DinoMod] the sauropods * Update fungus.json * no fungal bleed rate * Update hatchling.json * clean up hatchlings * Update juvenile.json * Update zed-dinosaur.json * Update egg.json * Update monstergroups_egg.json * Update zinosaur_upgrade.json * Update fungi.json * Update zinosaur.json * tank hulk * Update monstergroups_egg.json * Update zinosaur.json * Update and rename data/mods/DinoMod/forage.json to data/mods/DinoMod/items/forage.json * no item group copy-from * no item group extend * Update zinosaur_upgrade.json * Update zinosaur_upgrade.json * no vertebrate parts * doc vertebrate parts * Create zinosaur_burned.json * SMOKEBURST * doc SMOKEBURST * Update zinosaur_burned.json * add zamptosaurus scorched bugfix
cataclysmbnteam · Oct 31, 2022 · faea767 · faea767
1 parent 8d367e5
commit faea767
Show file tree

Hide file tree

Showing 14 changed files with 1,828 additions and 364 deletions.
diff --git a/data/mods/DinoMod/DESIGN.md b/data/mods/DinoMod/DESIGN.md
@@ -42,7 +42,7 @@ monsters folder:
 # DDA and BN
 As much as possible, there should be content and feature parity between both (all?) Cataclysm variants for the best player experience and easiest mod maintenance. As of October 2022 the known code differences between the two for DinoMod are:
 * Monstergroups folder - BN groups need  "default" and "cost_multiplier" to be defined, "weight should be "freq" instead
-* Monsters folder - DDA supports bullet armor and biosignature and dissect and melee_damage and aggro_character and "bleeds" (not the flag) and bleed_rate, and not the BLEEDS or the GUILT flag while BN supports BLEEDS and GUILT and melee_cut and not bullet armor or biosignature or dissect or melee damage or the death_guilt death_function or aggro_character or the "bleeds" entry or bleed_rate. DDA's petfood entry is handled by DOGFOOD, CATFOOD, and CATTLEFODDER flags in BN. Death functions for ACID and FIREBALL have different formatting also. RANGED_ATTACKER is a flag in DDA but not BN. smash special attack in DDA is SMASH in BN
+* Monsters folder - DDA supports bullet armor and biosignature and dissect and melee_damage and aggro_character and "bleeds" (not the flag) and bleed_rate, and not the BLEEDS or the GUILT flag while BN supports BLEEDS and GUILT and melee_cut and not bullet armor or biosignature or dissect or melee damage or the death_guilt death_function or aggro_character or the "bleeds" entry or bleed_rate. DDA's petfood entry is handled by DOGFOOD, CATFOOD, and CATTLEFODDER flags in BN. Death functions for ACID and FIREBALL and SMOKEBURST have different formatting also. RANGED_ATTACKER is a flag in DDA but not BN. smash special attack in DDA is SMASH in BN. No vertebrate parts to drop in BN
 * mutagen recipes - "activity_level" is removed in BN.
 * lab locations - lots of content missing or different in BN, science basements still need to be reconstructed from BN originals
 * laser items - BN port removes pocket_data and amm0_to_fire lines and changes damage_type bullet to stab

diff --git a/data/mods/DinoMod/forage.json b/data/mods/DinoMod/forage.json
diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json
@@ -307,49 +307,91 @@
     "type": "COMESTIBLE",
     "id": "egg_eoraptor",
     "name": "eoraptor egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_small",
     "rot_spawn": "GROUP_EGG_eoraptor"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_sarahsaurus",
+    "name": "sarahsaurus egg",
+    "copy-from": "egg_dino",
+    "rot_spawn": "GROUP_EGG_sarahsaurus"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_anchisaurus",
+    "name": "anchisaurus egg",
+    "copy-from": "egg_dino",
+    "rot_spawn": "GROUP_EGG_anchisaurus"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_issi",
+    "name": "issi egg",
+    "copy-from": "egg_dino",
+    "rot_spawn": "GROUP_EGG_issi"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_haplocanthosaurus",
+    "name": "haplocanthosaurus egg",
+    "copy-from": "egg_dino_large",
+    "rot_spawn": "GROUP_EGG_haplocanthosaurus"
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_amargasaurus",
+    "name": "amargasaurus egg",
+    "copy-from": "egg_dino_large",
+    "rot_spawn": "GROUP_EGG_amargasaurus"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_apatosaurus",
     "name": "apatosaurus egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_large",
     "rot_spawn": "GROUP_EGG_apatosaurus"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_brontosaurus",
     "name": "brontosaurus egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_large",
     "rot_spawn": "GROUP_EGG_brontosaurus"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_diplodocus",
     "name": "diplodocus egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_large",
     "rot_spawn": "GROUP_EGG_diplodocus"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_barosaurus",
+    "name": "barosaurus egg",
+    "copy-from": "egg_dino_large",
+    "rot_spawn": "GROUP_EGG_barosaurus"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_camarasaurus",
     "name": "camarasaurus egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_large",
     "rot_spawn": "GROUP_EGG_camarasaurus"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_brachiosaurus",
     "name": "brachiosaurus egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_large",
     "rot_spawn": "GROUP_EGG_brachiosaurus"
   },
   {
     "type": "COMESTIBLE",
     "id": "egg_alamosaurus",
     "name": "alamosaurus egg",
-    "copy-from": "egg_dino",
+    "copy-from": "egg_dino_large",
     "rot_spawn": "GROUP_EGG_alamosaurus"
   },
   {
@@ -499,13 +541,6 @@
     "copy-from": "egg_dino",
     "rot_spawn": "GROUP_EGG_qianzhousaurus"
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "egg_amargasaurus",
-    "name": "amargasaurus egg",
-    "copy-from": "egg_dino",
-    "rot_spawn": "GROUP_EGG_amargasaurus"
-  },
   {
     "type": "COMESTIBLE",
     "id": "egg_kosmoceratops",

diff --git a/data/mods/DinoMod/items/forage.json b/data/mods/DinoMod/items/forage.json
@@ -0,0 +1,28 @@
+[
+  {
+    "id": "forage_spring",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "egg_dino", "prob": 2, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_small", "prob": 1, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_large", "prob": 1, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_theropod", "prob": 2, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_theropod_small", "prob": 1, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_theropod_large", "prob": 1, "count-min": 2, "count-max": 5 }
+    ]
+  },
+  {
+    "id": "forage_summer",
+    "type": "item_group",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "egg_dino", "prob": 2, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_small", "prob": 1, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_large", "prob": 1, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_theropod", "prob": 2, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_theropod_small", "prob": 1, "count-min": 2, "count-max": 5 },
+      { "item": "egg_dino_theropod_large", "prob": 1, "count-min": 2, "count-max": 5 }
+    ]
+  }
+]
diff --git a/data/mods/DinoMod/monstergroups/fungi.json b/data/mods/DinoMod/monstergroups/fungi.json
@@ -46,18 +46,33 @@
     "monsters": [
       { "monster": "mon_zilophosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zeratosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zorvosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zallosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
       { "monster": "mon_zacrocanthosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
       { "monster": "mon_ziats_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
+      { "monster": "mon_zryptosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zappalachiosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zorgosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zalbertosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zanuqsaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zaspletosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zyrannosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
       { "monster": "mon_zallimimus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_ztruthiomimus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zornithomimus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zothronychus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zanzu_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zeinonychus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zutahraptor_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
+      { "monster": "mon_zarahsaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
+      { "monster": "mon_zanchisaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
+      { "monster": "mon_zissi_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
+      { "monster": "mon_zaplocanthosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
+      { "monster": "mon_zamargasaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 144 },
       { "monster": "mon_zapatosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zrontosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_ziplodocus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
+      { "monster": "mon_zarosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zamarasaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zrachiosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },
       { "monster": "mon_zalamosaurus_fungus", "freq": 1, "cost_multiplier": 0, "starts": 72 },

diff --git a/data/mods/DinoMod/monstergroups/monstergroups_egg.json b/data/mods/DinoMod/monstergroups/monstergroups_egg.json
@@ -2,15 +2,11 @@
   {
     "name": "GROUP_EGG_DINO",
     "type": "monstergroup",
-    "default": "mon_eoraptor_hatchling",
+    "default": "mon_sarahsaurus_hatchling",
     "monsters": [
-      { "monster": "mon_eoraptor_hatchling", "freq": 20, "cost_multiplier": 1 },
-      { "monster": "mon_apatosaurus_hatchling", "freq": 10, "cost_multiplier": 1 },
-      { "monster": "mon_brontosaurus_hatchling", "freq": 10, "cost_multiplier": 1 },
-      { "monster": "mon_diplodocus_hatchling", "freq": 20, "cost_multiplier": 1 },
-      { "monster": "mon_camarasaurus_hatchling", "freq": 20, "cost_multiplier": 1 },
-      { "monster": "mon_brachiosaurus_hatchling", "freq": 20, "cost_multiplier": 1 },
-      { "monster": "mon_alamosaurus_hatchling", "freq": 20, "cost_multiplier": 1 },
+      { "monster": "mon_sarahsaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
+      { "monster": "mon_anchisaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
+      { "monster": "mon_issi_hatchling", "freq": 5, "cost_multiplier": 1 },
       { "monster": "mon_scutellosaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
       { "monster": "mon_stegosaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
       { "monster": "mon_dyoplosaurus_hatchling", "freq": 5, "cost_multiplier": 1 },
@@ -26,11 +22,22 @@
       { "monster": "mon_pachyrhinosaurus_hatchling", "freq": 3, "cost_multiplier": 1 },
       { "monster": "mon_pentaceratops_hatchling", "freq": 3, "cost_multiplier": 1 },
       { "monster": "mon_torosaurus_hatchling", "freq": 3, "cost_multiplier": 1 },
-      { "monster": "mon_triceratops_hatchling", "freq": 3, "cost_multiplier": 1 },
-      { "monster": "mon_dimorphodon_hatchling", "freq": 10, "cost_multiplier": 1 },
-      { "monster": "mon_pteranodon_hatchling", "freq": 20, "cost_multiplier": 1 },
-      { "monster": "mon_quetzalcoatlus_hatchling", "freq": 5, "cost_multiplier": 1 },
-      { "monster": "mon_mosasaurus_hatchling", "freq": 5, "cost_multiplier": 1 }
+      { "monster": "mon_triceratops_hatchling", "freq": 3, "cost_multiplier": 1 }
+    ]
+  },
+  {
+    "name": "GROUP_EGG_DINO_LARGE",
+    "//": "North American dinos not theropods largest",
+    "default": "mon_apatosaurus_hatchling",
+    "type": "monstergroup",
+    "monsters": [
+      { "monster": "mon_apatosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
+      { "monster": "mon_brontosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
+      { "monster": "mon_diplodocus_hatchling", "freq": 142, "cost_multiplier": 1 },
+      { "monster": "mon_barosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
+      { "monster": "mon_camarasaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
+      { "monster": "mon_brachiosaurus_hatchling", "freq": 142, "cost_multiplier": 1 },
+      { "monster": "mon_alamosaurus_hatchling", "freq": 142, "cost_multiplier": 1 }
     ]
   },
   {
@@ -259,45 +266,81 @@
   },
   {
     "name": "GROUP_EGG_eoraptor",
-    "type": "monstergroup",
     "default": "mon_eoraptor_hatchling",
-    "monsters": [ { "monster": "mon_eoraptor_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_eoraptor_hatchling", "freq": 1, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_sarahsaurus",
+    "default": "mon_sarahsaurus_hatchling",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_sarahsaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_anchisaurus",
+    "type": "monstergroup",
+    "default": "mon_anchisaurus_hatchling",
+    "monsters": [ { "monster": "mon_anchisaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_issi",
+    "type": "monstergroup",
+    "default": "mon_issi_hatchling",
+    "monsters": [ { "monster": "mon_issi_hatchling", "freq": 1, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_haplocanthosaurus",
+    "type": "monstergroup",
+    "default": "mon_haplocanthosaurus_hatchling",
+    "monsters": [ { "monster": "mon_haplocanthosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_amargasaurus",
+    "type": "monstergroup",
+    "default": "mon_amargasaurus_hatchling",
+    "monsters": [ { "monster": "mon_amargasaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_apatosaurus",
     "type": "monstergroup",
     "default": "mon_apatosaurus_hatchling",
-    "monsters": [ { "monster": "mon_apatosaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_apatosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_brontosaurus",
     "type": "monstergroup",
     "default": "mon_brontosaurus_hatchling",
-    "monsters": [ { "monster": "mon_brontosaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_brontosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_diplodocus",
     "type": "monstergroup",
     "default": "mon_diplodocus_hatchling",
-    "monsters": [ { "monster": "mon_diplodocus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_diplodocus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
+  },
+  {
+    "name": "GROUP_EGG_barosaurus",
+    "type": "monstergroup",
+    "default": "mon_barosaurus_hatchling",
+    "monsters": [ { "monster": "mon_barosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_camarasaurus",
     "type": "monstergroup",
     "default": "mon_camarasaurus_hatchling",
-    "monsters": [ { "monster": "mon_camarasaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_camarasaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_brachiosaurus",
     "type": "monstergroup",
     "default": "mon_brachiosaurus_hatchling",
-    "monsters": [ { "monster": "mon_brachiosaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_brachiosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_alamosaurus",
     "type": "monstergroup",
     "default": "mon_alamosaurus_hatchling",
-    "monsters": [ { "monster": "mon_alamosaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
+    "monsters": [ { "monster": "mon_alamosaurus_hatchling", "freq": 1, "cost_multiplier": 1 } ]
   },
   {
     "name": "GROUP_EGG_scutellosaurus",