[DinoMod] aquilops (#59027)

* [DinoMod] aquilops * Update dinosaur_CBM.json * Update dinosaur.json * Update hatchling.json * Update egg.json * restore lizard dna * eoraptor less sci fi * Create nest_aquilops.json * Update dinosaur.json * Update lab.json * safe * Update monstergroups_egg.json * Update wilderness.json * Update map_extras.json * Update cooking_components.json * Update regional_overlay.json * Update dictionary.txt * 2
CleverRaven · Jul 8, 2022 · e27eb76 · e27eb76
1 parent 79348ec
commit e27eb76
Show file tree

Hide file tree

Showing 14 changed files with 187 additions and 4 deletions.
diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json
@@ -452,6 +452,13 @@
     "copy-from": "egg_dino",
     "rot_spawn": "GROUP_EGG_pachycephalosaurus"
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_aquilops",
+    "name": "aquilops egg",
+    "copy-from": "egg_dino_small",
+    "rot_spawn": "GROUP_EGG_aquilops"
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_pachyrhinosaurus",

diff --git a/data/mods/DinoMod/mapgen/map_extras/nest_aquilops.json b/data/mods/DinoMod/mapgen/map_extras/nest_aquilops.json
@@ -0,0 +1,69 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "update_mapgen_id": "mx_nest_aquilops",
+    "object": {
+      "rows": [
+        "                        ",
+        "   t                    ",
+        "            t           ",
+        "                        ",
+        "              t      t  ",
+        "       t   t----        ",
+        "         ----..-t       ",
+        " t    t---..-..---t  t  ",
+        "       -.-..---..--t    ",
+        "     ---.---..,--.-     ",
+        "    t-.--..,-...-.--    ",
+        "      --...-..-.--.     ",
+        "     -..-.,..-.,..-t  t ",
+        " t   --....-,-..---     ",
+        "     t---...-.-.-..-    ",
+        "      -.---.-....---    ",
+        "    t  --.-....---t     ",
+        "       t-....---t    t  ",
+        "         -----t         ",
+        "           t            ",
+        "                 t      ",
+        "      t                 ",
+        "                        ",
+        "               t        "
+      ],
+      "flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
+      "terrain": {
+        "t": [ "t_region_tree", "t_region_groundcover_forest" ],
+        ",": [ "t_pit_shallow" ],
+        "-": [ "t_fern", "t_grass", "t_grass", "t_region_groundcover_forest" ],
+        ".": [ "t_dirt", "t_dirt", "t_grass", "t_grass", "t_region_groundcover_forest" ]
+      },
+      "place_monster": [
+        {
+          "monster": "mon_aquilops",
+          "x": [ 0, 23 ],
+          "y": [ 0, 23 ],
+          "repeat": [ 2, 10 ],
+          "chance": 50,
+          "spawn_data": { "patrol": [ { "x": [ 0, 23 ], "y": [ 0, 23 ] } ] }
+        }
+      ],
+      "place_item": [
+        { "item": "egg_aquilops", "x": 10, "y": 10, "amount": [ 3, 15 ] },
+        { "item": "egg_aquilops", "x": 14, "y": 9, "amount": [ 3, 15 ] },
+        { "item": "egg_aquilops", "x": 10, "y": 12, "amount": [ 3, 15 ] },
+        { "item": "egg_aquilops", "x": 15, "y": 12, "amount": [ 3, 15 ] },
+        { "item": "egg_aquilops", "x": 12, "y": 13, "amount": [ 3, 15 ] },
+        { "item": "feather", "x": [ 0, 23 ], "y": [ 0, 23 ], "amount": [ 10, 20 ], "repeat": [ 1, 24 ], "chance": 20 },
+        {
+          "item": "straw_pile",
+          "x": [ 0, 23 ],
+          "y": [ 0, 23 ],
+          "amount": [ 10, 20 ],
+          "repeat": [ 1, 24 ],
+          "chance": 20
+        }
+      ],
+      "place_items": [ { "item": "trash_forest", "x": [ 4, 17 ], "y": [ 6, 15 ], "repeat": [ 1, 3 ], "chance": 40 } ]
+    }
+  }
+]
diff --git a/data/mods/DinoMod/monstergroups/dinosaur.json b/data/mods/DinoMod/monstergroups/dinosaur.json
@@ -54,6 +54,7 @@
       { "monster": "mon_maiasaura", "weight": 20, "cost_multiplier": 10, "pack_size": [ 4, 12 ] },
       { "monster": "mon_edmontosaurus", "weight": 20, "cost_multiplier": 10, "pack_size": [ 4, 12 ] },
       { "monster": "mon_pachycephalosaurus", "weight": 20, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_aquilops", "weight": 3, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
       { "monster": "mon_pachyrhinosaurus", "weight": 3, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
       { "monster": "mon_pentaceratops", "weight": 3, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
       { "monster": "mon_torosaurus", "weight": 3, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
@@ -78,6 +79,7 @@
       { "monster": "mon_dyoplosaurus", "weight": 20, "cost_multiplier": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_camptosaurus", "weight": 100, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_pachycephalosaurus", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_aquilops", "weight": 25, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_oryctodromeus", "weight": 5, "cost_multiplier": 30, "pack_size": [ 1, 2 ] }
     ]
   },
@@ -131,6 +133,7 @@
       { "monster": "mon_maiasaura_hatchling", "weight": 20, "cost_multiplier": 10, "pack_size": [ 1, 2 ] },
       { "monster": "mon_edmontosaurus_hatchling", "weight": 20, "cost_multiplier": 10, "pack_size": [ 1, 2 ] },
       { "monster": "mon_pachycephalosaurus_hatchling", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_aquilops_hatchling", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_pachyrhinosaurus_hatchling", "weight": 10, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
       { "monster": "mon_pentaceratops_hatchling", "weight": 10, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },
       { "monster": "mon_torosaurus_hatchling", "weight": 10, "cost_multiplier": 30, "pack_size": [ 1, 2 ] },

diff --git a/data/mods/DinoMod/monstergroups/lab.json b/data/mods/DinoMod/monstergroups/lab.json
@@ -32,6 +32,23 @@
       { "monster": "mon_zianzhousaurus", "weight": 25, "cost_multiplier": 10, "starts": "7 days" },
       { "monster": "mon_zianzhousaurus", "weight": 25, "cost_multiplier": 10, "starts": "28 days" },
       { "monster": "mon_zianzhousaurus", "weight": 25, "cost_multiplier": 10, "starts": "90 days" },
+      {
+        "monster": "mon_tyrannosaurus_bio_op",
+        "weight": 100,
+        "cost_multiplier": 20,
+        "starts": "3 days",
+        "ends": "28 days"
+      },
+      { "monster": "mon_zyrannosaurus_bio_op", "weight": 25, "cost_multiplier": 30, "starts": "3 days" },
+      { "monster": "mon_zyrannosaurus_bio_op", "weight": 25, "cost_multiplier": 30, "starts": "7 days" },
+      { "monster": "mon_zyrannosaurus_bio_op", "weight": 25, "cost_multiplier": 30, "starts": "28 days" },
+      {
+        "monster": "mon_zyrannosaurus_bio_op",
+        "weight": 25,
+        "cost_multiplier": 30,
+        "starts": "90 days",
+        "pack_size": [ 2, 3 ]
+      },
       { "monster": "mon_albertonykus_bio_op", "weight": 100, "cost_multiplier": 10, "pack_size": [ 2, 3 ] },
       { "monster": "mon_saurornitholestes_bio_op", "weight": 100, "cost_multiplier": 10, "pack_size": [ 2, 3 ] },
       { "monster": "mon_velociraptor_bio_op", "weight": 100, "cost_multiplier": 10, "pack_size": [ 2, 3 ] },
@@ -96,6 +113,7 @@
       { "monster": "mon_zachycephalosaurus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "7 days" },
       { "monster": "mon_zachycephalosaurus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "28 days" },
       { "monster": "mon_zachycephalosaurus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "90 days" },
+      { "monster": "mon_aquilops_bio_op", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
       { "monster": "mon_trice_bio_op", "weight": 100, "cost_multiplier": 20, "ends": "28 days" },
       { "monster": "mon_zriceratops_bio_op", "weight": 25, "cost_multiplier": 40, "starts": "3 days" },
       { "monster": "mon_zriceratops_bio_op", "weight": 25, "cost_multiplier": 40, "starts": "7 days" },

diff --git a/data/mods/DinoMod/monstergroups/misc.json b/data/mods/DinoMod/monstergroups/misc.json
@@ -30,6 +30,7 @@
       { "monster": "mon_albertonykus", "weight": 50, "pack_size": [ 1, 2 ] },
       { "monster": "mon_eoraptor", "weight": 20, "pack_size": [ 4, 12 ] },
       { "monster": "mon_scutellosaurus", "weight": 20, "pack_size": [ 2, 4 ] },
+      { "monster": "mon_aquilops", "weight": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_oryctodromeus", "weight": 20, "pack_size": [ 1, 2 ] },
       { "monster": "mon_dimorphodon", "weight": 50, "pack_size": [ 2, 4 ] }
     ]

diff --git a/data/mods/DinoMod/monstergroups/monstergroups_egg.json b/data/mods/DinoMod/monstergroups/monstergroups_egg.json
@@ -29,6 +29,7 @@
     "monsters": [
       { "monster": "mon_eoraptor_hatchling", "weight": 20 },
       { "monster": "mon_scutellosaurus_hatchling", "weight": 5 },
+      { "monster": "mon_aquilops_hatchling", "weight": 5 },
       { "monster": "mon_oryctodromeus_hatchling", "weight": 5 },
       { "monster": "mon_dimorphodon_hatchling", "weight": 10 }
     ]
@@ -342,6 +343,11 @@
     "type": "monstergroup",
     "monsters": [ { "monster": "mon_pachycephalosaurus_hatchling" } ]
   },
+  {
+    "name": "GROUP_EGG_aquilops",
+    "type": "monstergroup",
+    "monsters": [ { "monster": "mon_aquilops_hatchling" } ]
+  },
   {
     "name": "GROUP_EGG_pachyrhinosaurus",
     "type": "monstergroup",

diff --git a/data/mods/DinoMod/monstergroups/wilderness.json b/data/mods/DinoMod/monstergroups/wilderness.json
@@ -177,6 +177,13 @@
         "pack_size": [ 1, 2 ],
         "conditions": [ "DUSK", "DAY", "DAWN", "SPRING", "SUMMER", "AUTUMN" ]
       },
+      {
+        "monster": "mon_aquilops",
+        "weight": 10,
+        "cost_multiplier": 0,
+        "pack_size": [ 1, 2 ],
+        "conditions": [ "DUSK", "DAY", "DAWN", "SPRING", "SUMMER", "AUTUMN" ]
+      },
       {
         "monster": "mon_pachyrhinosaurus",
         "weight": 20,

diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json
@@ -950,7 +950,7 @@
     "families": [ "prof_intro_biology", "prof_wp_dino" ],
     "weakpoint_sets": [ "wps_dinosaur_body" ],
     "hp": 10,
-    "death_drops": { "subtype": "collection", "groups": [ [ "science", 100 ], [ "mut_lab", 10 ] ] },
+    "death_drops": { "subtype": "collection", "groups": [ [ "produce", 100 ], [ "vertebrate_parts", 10 ] ] },
     "description": "A bipedal dinosaur about the size of a chicken.  It darts around quickly and has long arms for grabbing what it desires.  It's holding something.",
     "reproduction": { "baby_egg": "egg_eoraptor", "baby_count": 3, "baby_timer": 12 },
     "baby_flags": [ "SPRING", "SUMMER" ],
@@ -960,7 +960,7 @@
     "harvest": "mammal_tiny",
     "vision_night": 5,
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "FRIEND_DIED" ],
-    "categories": [ "DINOSAUR", "WILDLIFE", "MAN_MADE" ]
+    "categories": [ "DINOSAUR", "WILDLIFE" ]
   },
   {
     "type": "MONSTER",
@@ -1462,6 +1462,30 @@
     "anger_triggers": [ "HURT", "FRIEND_ATTACKED", "PLAYER_NEAR_BABY" ],
     "categories": [ "DINOSAUR", "WILDLIFE" ]
   },
+  {
+    "type": "MONSTER",
+    "id": "mon_aquilops",
+    "name": { "str_sp": "aquilops" },
+    "copy-from": "mon_pachyrhinosaurus",
+    "looks_like": "mon_eoraptor",
+    "volume": "2 L",
+    "weight": "2 kg",
+    "melee_skill": 4,
+    "diff": 0,
+    "aggression": -10,
+    "morale": 10,
+    "speed": 110,
+    "melee_dice": 2,
+    "melee_dice_sides": 6,
+    "melee_damage": [ { "damage_type": "cut", "amount": 0 } ],
+    "dodge": 5,
+    "hp": 5,
+    "description": "A small rhino-like dinosaur with a bony crest studded with small horns and a hooked beak.",
+    "reproduction": { "baby_egg": "egg_aquilops", "baby_count": 20, "baby_timer": 24 },
+    "special_attacks": [ [ "EAT_CROP", 30 ] ],
+    "flags": [ "SEES", "SMELLS", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "CANPLAY" ],
+    "harvest": "mammal_tiny"
+  },
   {
     "type": "MONSTER",
     "id": "mon_pachyrhinosaurus",

diff --git a/data/mods/DinoMod/monsters/dinosaur_CBM.json b/data/mods/DinoMod/monsters/dinosaur_CBM.json
@@ -296,6 +296,33 @@
     "special_when_hit": [ "ZAPBACK", 75 ],
     "dissect": "dissect_CBM_DINO"
   },
+  {
+    "type": "MONSTER",
+    "id": "mon_aquilops_bio_op",
+    "name": { "str_sp": "aquilops bio-operator" },
+    "copy-from": "mon_aquilops",
+    "diff": 5,
+    "proportional": { "hp": 1.2, "speed": 1.15 },
+    "relative": {
+      "morale": 50,
+      "aggression": 50,
+      "melee_skill": 2,
+      "melee_dice": 1,
+      "dodge": 2,
+      "armor_bash": 3,
+      "armor_cut": 3,
+      "armor_bullet": 3
+    },
+    "extend": { "flags": [ "ACIDPROOF", "ELECTRIC" ] },
+    "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
+    "vision_day": 100,
+    "luminance": 4,
+    "special_attacks": [ [ "BIO_OP_TAKEDOWN", 20 ] ],
+    "zombify_into": "mon_zachycephalosaurus_bio_op",
+    "description": "A small four legged dinosaur dotted with crackling bionics with a glowing beak and small horns",
+    "special_when_hit": [ "ZAPBACK", 75 ],
+    "dissect": "dissect_CBM_DINO"
+  },
   {
     "type": "MONSTER",
     "id": "mon_trice_bio_op",

diff --git a/data/mods/DinoMod/monsters/hatchling.json b/data/mods/DinoMod/monsters/hatchling.json
@@ -408,6 +408,13 @@
     "name": "light green and yellow hatchling",
     "upgrades": { "age_grow": 20, "into": "mon_pachycephalosaurus_juvenile" }
   },
+  {
+    "id": "mon_aquilops_hatchling",
+    "type": "MONSTER",
+    "copy-from": "mon_pachycephalosaurus_hatchling",
+    "name": "light green and magenta hatchling",
+    "upgrades": { "age_grow": 30, "into": "mon_aquilops" }
+  },
   {
     "id": "mon_pachyrhinosaurus_hatchling",
     "type": "MONSTER",

diff --git a/data/mods/DinoMod/overmap/map_extras.json b/data/mods/DinoMod/overmap/map_extras.json
@@ -66,6 +66,17 @@
     "autonote": true,
     "flags": [ "CLASSIC" ]
   },
+  {
+    "id": "mx_nest_aquilops",
+    "type": "map_extra",
+    "name": { "str": "aquilops nest" },
+    "description": "An aquilops nest.",
+    "generator": { "generator_method": "update_mapgen", "generator_id": "mx_nest_aquilops" },
+    "sym": "D",
+    "color": "light_green",
+    "autonote": true,
+    "flags": [ "CLASSIC" ]
+  },
   {
     "id": "mx_nest_camptosaurus",
     "type": "map_extra",

diff --git a/data/mods/DinoMod/regional_overlay.json b/data/mods/DinoMod/regional_overlay.json
@@ -7,7 +7,7 @@
       "forest_water": {
         "chance": 20,
         "extras": {
-          "mx_mass_grave_dino": 60,
+          "mx_mass_grave_dino": 30,
           "mx_nest_acrocanthosaurus": 30,
           "mx_nest_albertosaurus": 30,
           "mx_nest_allosaurus": 30,
@@ -47,6 +47,7 @@
           "mx_nest_maiasaura": 30,
           "mx_nest_nodosaurus": 30,
           "mx_nest_pachycephalosaurus": 30,
+          "mx_nest_aquilops": 30,
           "mx_nest_pachyrhinosaurus": 30,
           "mx_nest_parasaurolophus": 30,
           "mx_nest_pentaceratops": 30,
@@ -56,7 +57,7 @@
           "mx_nest_triceratops": 30
         }
       },
-      "field": { "chance": 6, "extras": { "mx_mass_grave_dino": 50 } }
+      "field": { "chance": 6, "extras": { "mx_mass_grave_dino": 30 } }
     },
     "city": { "parks": { "dinozoo": 25 } }
   }

diff --git a/data/mods/DinoMod/requirements/cooking_components.json b/data/mods/DinoMod/requirements/cooking_components.json
@@ -70,6 +70,7 @@
         [ "egg_stenonychosaurus", 1 ],
         [ "egg_eoraptor", 1 ],
         [ "egg_scutellosaurus", 1 ],
+        [ "egg_aquilops", 1 ],
         [ "egg_oryctodromeus", 1 ],
         [ "egg_pteranodon", 1 ]
       ]

diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt
@@ -86,6 +86,7 @@ aquacultural
 aquaculture
 aquamarines
 aqueles
+aquilops
 aramid
 arborescent
 args