From acedd25cd8c2abe62e29b9901d602f12cb5c17a2 Mon Sep 17 00:00:00 2001
From: LyleSY <lyle.sollayates@Gmail.com>
Date: Tue, 14 Apr 2020 15:10:23 -0400
Subject: [PATCH] [DinoMod]Add monster Pachycephalosaurus (#39486)

* [DinoMod]Add monster Pachycephalosaurus

New content, adds egg laying and rideable Pachycephalosaurus, tougher and less common than gallimimus

* Linted

* Added pachycephalosaurus egg

Required for the new pachycephalosaurus monster to not break Dino Mod. Linted.

* Added dimorphodon eggs

Needed another edit to reset the tests now that they're working. Added dimorphodon eggs to set up egg laying for that monster. Linted.

* corrected name of dimorphodon egg to match

corrected copy-paste error
---
 data/mods/DinoMod/dinosaur.json | 57 +++++++++++++++++++++++++++++++++
 data/mods/DinoMod/egg.json      | 12 +++++++
 2 files changed, 69 insertions(+)

diff --git a/data/mods/DinoMod/dinosaur.json b/data/mods/DinoMod/dinosaur.json
index f061b4bf3cc9e..894cdb7bc0681 100644
--- a/data/mods/DinoMod/dinosaur.json
+++ b/data/mods/DinoMod/dinosaur.json
@@ -97,6 +97,48 @@
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "HURT", "FIRE" ],
     "categories": [ "DINOSAUR" ]
   },
+  {
+    "type": "MONSTER",
+    "id": "mon_pachycephalosaurus",
+    "name": { "str": "Pachycephalosaurus", "str_pl": "Pachycephalosaurus" },
+    "species": "DINOSAUR",
+    "default_faction": "pachycephalosaurus",
+    "symbol": "D",
+    "color": "light_green_yellow",
+    "volume": "450000 ml",
+    "weight": "450 kg",
+    "material": "flesh",
+    "aggression": -40,
+    "morale": -10,
+    "speed": 150,
+    "melee_skill": 4,
+    "melee_dice": 1,
+    "melee_dice_sides": 4,
+    "dodge": 3,
+    "armor_bash": 2,
+    "armor_cut": 1,
+    "hp": 40,
+    "death_function": [ "NORMAL" ],
+    "description": "A feathered bipedal dinosaur, standing as tall as a human.  It looks like a reptilian ostrich with a round hard-looking domed head.",
+    "reproduction": { "baby_egg": "egg_pachycephalosaurus", "baby_count": 3, "baby_timer": 12 },
+    "baby_flags": [ "SPRING", "SUMMER" ],
+    "biosignature": { "biosig_item": "feces_bird", "biosig_timer": 3 },
+    "flags": [
+      "SEES",
+      "SMELLS",
+      "HEARS",
+      "GOODHEARING",
+      "ANIMAL",
+      "PATH_AVOID_DANGER_1",
+      "PET_MOUNTABLE",
+      "CATTLEFODDER",
+      "PET_WONT_FOLLOW",
+      "WARM"
+    ],
+    "harvest": "dino_feather_leather",
+    "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "HURT", "FIRE" ],
+    "categories": [ "DINOSAUR" ]
+  },
   {
     "type": "MONSTER",
     "id": "mon_spinosaurus",
@@ -595,6 +637,13 @@
     "name": "light green and yellow hatchling",
     "upgrades": { "age_grow": 20, "into": "mon_gallimimus" }
   },
+  {
+    "id": "mon_pachycephalosaurus_hatchling",
+    "type": "MONSTER",
+    "copy-from": "mon_compsognathus_hatchling",
+    "name": "light green and yellow hatchling",
+    "upgrades": { "age_grow": 20, "into": "mon_pachycephalosaurus" }
+  },
   {
     "id": "mon_spinosaurus_hatchling",
     "type": "MONSTER",
@@ -686,6 +735,7 @@
     "monsters": [
       { "monster": "mon_compsognathus", "freq": 100, "cost_multiplier": 0, "pack_size": [ 4, 12 ] },
       { "monster": "mon_gallimimus", "freq": 50, "cost_multiplier": 0, "pack_size": [ 4, 8 ] },
+      { "monster": "mon_pachycephalosaurus", "freq": 25, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_spinosaurus", "freq": 1, "cost_multiplier": 50 },
       { "monster": "mon_tyrannosaurus", "freq": 1, "cost_multiplier": 40 },
       { "monster": "mon_triceratops", "freq": 3, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
@@ -763,6 +813,13 @@
         "pack_size": [ 4, 8 ],
         "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
       },
+      {
+        "monster": "mon_pachycephalosaurus",
+        "freq": 10,
+        "cost_multiplier": 0,
+        "pack_size": [ 1, 2 ],
+        "conditions": [ "SPRING", "SUMMER", "AUTUMN" ]
+      },
       {
         "monster": "mon_stegosaurus",
         "freq": 10,
diff --git a/data/mods/DinoMod/egg.json b/data/mods/DinoMod/egg.json
index e92131e9cd3cf..314370df84825 100644
--- a/data/mods/DinoMod/egg.json
+++ b/data/mods/DinoMod/egg.json
@@ -33,6 +33,12 @@
     "name": "gallimimus egg",
     "copy-from": "egg_dino"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_pachycephalosaurus",
+    "name": "pachycephalosaurus egg",
+    "copy-from": "egg_dino"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_spinosaurus",
@@ -99,6 +105,12 @@
     "name": "parasaurolophus egg",
     "copy-from": "egg_dino"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_dimorphodon",
+    "name": "dimorphodon egg",
+    "copy-from": "egg_dino"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_dilophosaurus",