[DinoMod] nedcolbertia

data/mods/DinoMod/items/egg.json

@@ -235,6 +235,13 @@
     "copy-from": "egg_dino_theropod_small",
     "rot_spawn": { "monster": "mon_compsognathus_hatchling" }
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "egg_nedcolbertia",
+    "name": "nedcolbertia egg",
+    "copy-from": "egg_dino_theropod",
+    "rot_spawn": { "monster": "mon_nedcolbertia_hatchling" }
+  },
   {
     "type": "COMESTIBLE",
     "id": "egg_gallimimus",

data/mods/DinoMod/mapgen/map_extras/nest_nedcolbertia.json

@@ -0,0 +1,77 @@
+[
+  {
+    "type": "mapgen",
+    "method": "json",
+    "update_mapgen_id": "mx_nest_nedcolbertia",
+    "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_nedcolbertia",
+          "x": [ 0, 23 ],
+          "y": [ 0, 23 ],
+          "repeat": [ 2, 10 ],
+          "chance": 50,
+          "spawn_data": { "patrol": [ { "x": [ 0, 23 ], "y": [ 0, 23 ] } ] }
+        }
+      ],
+      "place_item": [
+        { "item": "egg_nedcolbertia", "x": 10, "y": 10, "amount": [ 3, 15 ] },
+        { "item": "egg_nedcolbertia", "x": 14, "y": 9, "amount": [ 3, 15 ] },
+        { "item": "egg_nedcolbertia", "x": 10, "y": 12, "amount": [ 3, 15 ] },
+        { "item": "egg_nedcolbertia", "x": 15, "y": 12, "amount": [ 3, 15 ] },
+        { "item": "egg_nedcolbertia", "x": 12, "y": 13, "amount": [ 3, 15 ] },
+        { "item": "feather", "x": [ 0, 23 ], "y": [ 0, 23 ], "amount": [ 10, 20 ], "repeat": [ 1, 24 ], "chance": 20 },
+        {
+          "item": "down_feather",
+          "x": [ 0, 23 ],
+          "y": [ 0, 23 ],
+          "amount": [ 5, 10 ],
+          "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 } ]
+    }
+  }
+]

data/mods/DinoMod/monstergroups/dinosaur.json

@@ -43,6 +43,7 @@
     "name": "GROUP_DINOSAUR_HARMLESS",
     "monsters": [
       { "monster": "mon_compsognathus", "weight": 100, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_nedcolbertia", "weight": 50, "pack_size": [ 1, 2 ] },
       { "monster": "mon_gallimimus", "weight": 50, "pack_size": [ 1, 2 ] },
       { "monster": "mon_struthiomimus", "weight": 50, "pack_size": [ 1, 2 ] },
       { "monster": "mon_ornithomimus", "weight": 50, "pack_size": [ 1, 2 ] },
@@ -91,6 +92,7 @@
     "name": "GROUP_DINOSAUR_HARMLESS_HATCHLING",
     "monsters": [
       { "monster": "mon_compsognathus_hatchling", "weight": 20, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
+      { "monster": "mon_nedcolbertia_hatchling", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_gallimimus_hatchling", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_struthiomimus_hatchling", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_ornithomimus_hatchling", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
@@ -193,6 +195,7 @@
     "type": "monstergroup",
     "name": "GROUP_DINOSAUR_HARMLESS_JUVENILE",
     "monsters": [
+      { "monster": "mon_nedcolbertia_juvenile", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_gallimimus_juvenile", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_struthiomimus_juvenile", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_ornithomimus_juvenile", "weight": 50, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },

data/mods/DinoMod/monstergroups/fungi.json

@@ -16,6 +16,7 @@
       { "monster": "mon_zanuqsaurus_fungus", "starts": "3 days" },
       { "monster": "mon_zaspletosaurus_fungus", "starts": "3 days" },
       { "monster": "mon_zyrannosaurus_fungus", "starts": "6 days" },
+      { "monster": "mon_zedcolbertia_fungus", "starts": "3 days" },
       { "monster": "mon_zallimimus_fungus", "starts": "3 days" },
       { "monster": "mon_ztruthiomimus_fungus", "starts": "3 days" },
       { "monster": "mon_zornithomimus_fungus", "starts": "3 days" },

data/mods/DinoMod/monstergroups/lab.json

@@ -22,7 +22,7 @@
     "type": "monstergroup",
     "name": "GROUP_BIO_DINO_PRED",
     "monsters": [
-      { "monster": "mon_spinosaurus_bio_op", "weight": 100, "cost_multiplier": 20, "starts": "3 days", "ends": "28 days" },
+      { "monster": "mon_spinosaurus", "weight": 100, "cost_multiplier": 20, "starts": "3 days", "ends": "28 days" },
       { "monster": "mon_zpinosaurus", "weight": 25, "cost_multiplier": 30, "starts": "3 days" },
       { "monster": "mon_zpinosaurus", "weight": 25, "cost_multiplier": 30, "starts": "7 days" },
       { "monster": "mon_zpinosaurus", "weight": 25, "cost_multiplier": 30, "starts": "28 days" },
@@ -113,11 +113,26 @@
     "type": "monstergroup",
     "name": "GROUP_BIO_DINO_HERB",
     "monsters": [
+      { "monster": "mon_nedcolbertia_bio_op", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
+      { "monster": "mon_zedcolbertia_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "3 days" },
+      { "monster": "mon_zedcolbertia_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "7 days" },
+      { "monster": "mon_zedcolbertia_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "28 days" },
+      { "monster": "mon_zedcolbertia_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "90 days" },
       { "monster": "mon_gallimimus_bio_op", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
       { "monster": "mon_zallimimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "3 days" },
       { "monster": "mon_zallimimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "7 days" },
       { "monster": "mon_zallimimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "28 days" },
       { "monster": "mon_zallimimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "90 days" },
+      { "monster": "mon_struthiomimus_bio_op", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
+      { "monster": "mon_ztruthiomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "3 days" },
+      { "monster": "mon_ztruthiomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "7 days" },
+      { "monster": "mon_ztruthiomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "28 days" },
+      { "monster": "mon_ztruthiomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "90 days" },
+      { "monster": "mon_ornithomimus_bio_op", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
+      { "monster": "mon_zornithomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "3 days" },
+      { "monster": "mon_zornithomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "7 days" },
+      { "monster": "mon_zornithomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "28 days" },
+      { "monster": "mon_zornithomimus_bio_op", "weight": 25, "cost_multiplier": 20, "starts": "90 days" },
       { "monster": "mon_amargasaurus", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
       { "monster": "mon_amargasaurus_bio_op", "weight": 100, "cost_multiplier": 10, "ends": "28 days" },
       { "monster": "mon_zamargasaurus_bio_op", "weight": 25, "cost_multiplier": 10, "starts": "3 days" },

data/mods/DinoMod/monstergroups/misc.json

@@ -24,6 +24,7 @@
     "name": "GROUP_SAFE",
     "is_safe": true,
     "monsters": [
+      { "monster": "mon_nedcolbertia", "weight": 50, "pack_size": [ 4, 8 ] },
       { "monster": "mon_gallimimus", "weight": 50, "pack_size": [ 4, 8 ] },
       { "monster": "mon_struthiomimus", "weight": 50, "pack_size": [ 4, 8 ] },
       { "monster": "mon_ornithomimus", "weight": 50, "pack_size": [ 4, 8 ] },

data/mods/DinoMod/monstergroups/monstergroups_egg.json

@@ -93,6 +93,7 @@
       { "monster": "mon_albertosaurus_hatchling", "weight": 8 },
       { "monster": "mon_nanuqsaurus_hatchling", "weight": 8 },
       { "monster": "mon_daspletosaurus_hatchling", "weight": 8 },
+      { "monster": "mon_nedcolbertia_hatchling", "weight": 20 },
       { "monster": "mon_gallimimus_hatchling", "weight": 20 },
       { "monster": "mon_struthiomimus_hatchling", "weight": 20 },
       { "monster": "mon_ornithomimus_hatchling", "weight": 20 },

data/mods/DinoMod/monstergroups/wilderness.json

@@ -13,6 +13,7 @@
     "name": "GROUP_WILDERNESS_FOREST_DINO",
     "is_animal": true,
     "monsters": [
+      { "monster": "mon_nedcolbertia", "weight": 5, "pack_size": [ 4, 8 ] },
       { "monster": "mon_gallimimus", "weight": 5, "pack_size": [ 4, 8 ] },
       { "monster": "mon_struthiomimus", "weight": 5, "pack_size": [ 4, 8 ] },
       { "monster": "mon_ornithomimus", "weight": 5, "pack_size": [ 4, 8 ] },

data/mods/DinoMod/monstergroups/zinosaur.json

@@ -18,6 +18,7 @@
       { "monster": "mon_zanuqsaurus", "weight": 4, "cost_multiplier": 70, "starts": "3 days" },
       { "monster": "mon_zaspletosaurus", "weight": 4, "cost_multiplier": 70, "starts": "3 days" },
       { "monster": "mon_zyrannosaurus", "weight": 80, "cost_multiplier": 80, "starts": "6 days" },
+      { "monster": "mon_zedcolbertia", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_zallimimus", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_ztruthiomimus", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_zornithomimus", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
@@ -103,6 +104,7 @@
       { "monster": "mon_zanuqsaurus_scorched", "weight": 4, "cost_multiplier": 70, "starts": "3 days" },
       { "monster": "mon_zaspletosaurus_scorched", "weight": 4, "cost_multiplier": 70, "starts": "3 days" },
       { "monster": "mon_zyrannosaurus_scorched", "weight": 80, "cost_multiplier": 80, "starts": "6 days" },
+      { "monster": "mon_zedcolbertia_scorched", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_zallimimus_scorched", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_ztruthiomimus_scorched", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
       { "monster": "mon_zornithomimus_scorched", "weight": 200, "starts": "3 days", "pack_size": [ 1, 2 ] },
@@ -306,6 +308,15 @@
       { "monster": "mon_zyrannosaurus_brute", "weight": 300 }
     ]
   },
+  {
+    "type": "monstergroup",
+    "name": "GROUP_zedcolbertia_UPGRADE",
+    "monsters": [
+      { "monster": "mon_sedcolbertia", "weight": 400 },
+      { "monster": "mon_zedcolbertia_shady", "weight": 300 },
+      { "monster": "mon_zedcolbertia_brute", "weight": 300 }
+    ]
+  },
   {
     "type": "monstergroup",
     "name": "GROUP_zallimimus_UPGRADE",

data/mods/DinoMod/monsters/dinosaur.json

@@ -641,33 +641,33 @@
   },
   {
     "type": "MONSTER",
-    "id": "mon_gallimimus",
-    "name": { "str_sp": "gallimimus" },
+    "id": "mon_nedcolbertia",
+    "name": { "str_sp": "nedcolbertia" },
     "species": "DINOSAUR",
     "default_faction": "herbivore_dino",
     "aggro_character": false,
     "symbol": "D",
     "color": "light_gray",
-    "volume": "440 L",
-    "weight": "440 kg",
+    "volume": "50 L",
+    "weight": "50 kg",
     "bodytype": "ostrich",
     "material": [ "flesh" ],
-    "stomach_size": 8800,
+    "stomach_size": 1000,
     "aggression": -60,
     "morale": -20,
-    "speed": 170,
-    "attack_cost": 170,
+    "speed": 160,
+    "attack_cost": 160,
     "melee_skill": 4,
     "melee_dice": 1,
     "melee_dice_sides": 4,
     "melee_damage": [ { "damage_type": "cut", "amount": 2 } ],
     "dodge": 8,
     "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_dino" ],
     "weakpoint_sets": [ "wps_dinosaur_body" ],
-    "hp": 110,
-    "zombify_into": "mon_zallimimus",
-    "description": "A feathered bipedal dinosaur, standing as tall as a human.  It looks somewhat like a reptilian ostrich.",
-    "reproduction": { "baby_type": { "baby_egg": "egg_gallimimus" }, "baby_count": 3, "baby_timer": 9 },
+    "hp": 70,
+    "zombify_into": "mon_zedcolbertia",
+    "description": "A feathered bipedal dinosaur, about the size of a large dog.  It looks somewhat like an ostrich but with no beak.",
+    "reproduction": { "baby_type": { "baby_egg": "egg_nedcolbertia" }, "baby_count": 3, "baby_timer": 9 },
     "baby_flags": [ "SPRING", "SUMMER" ],
     "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 2 },
     "special_attacks": [ [ "EAT_CROP", 60 ], [ "EAT_FOOD", 60 ], [ "BROWSE", 50 ], [ "scratch", 20 ] ],
@@ -688,6 +688,20 @@
     "fear_triggers": [ "SOUND", "PLAYER_CLOSE", "HURT", "FRIEND_DIED" ],
     "categories": [ "DINOSAUR", "WILDLIFE" ]
   },
+  {
+    "type": "MONSTER",
+    "id": "mon_gallimimus",
+    "name": { "str_sp": "gallimimus" },
+    "copy-from": "mon_nedcolbertia",
+    "volume": "440 L",
+    "weight": "440 kg",
+    "stomach_size": 8400,
+    "speed": 170,
+    "attack_cost": 170,
+    "zombify_into": "mon_zallimimus",
+    "description": "A feathered bipedal dinosaur, standing as tall as a human.  It looks somewhat like an ostrich with a beak.",
+    "reproduction": { "baby_type": { "baby_egg": "egg_gallimimus" }, "baby_count": 3, "baby_timer": 9 }
+  },
   {
     "type": "MONSTER",
     "id": "mon_struthiomimus",

data/mods/DinoMod/monsters/dinosaur_CBM.json

@@ -108,6 +108,31 @@
     "special_when_hit": [ "ZAPBACK", 75 ],
     "dissect": "dissect_CBM_DINO"
   },
+  {
+    "type": "MONSTER",
+    "id": "mon_nedcolbertia_bio_op",
+    "name": { "str_sp": "nedcolbertia bio-operator" },
+    "copy-from": "mon_nedcolbertia",
+    "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, "cut": 3, "bullet": 3 }
+    },
+    "extend": { "flags": [ "ACIDPROOF", "ELECTRIC" ] },
+    "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
+    "vision_day": 100,
+    "luminance": 4,
+    "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ],
+    "zombify_into": "mon_zedcolbertia_bio_op",
+    "description": "A fast-moving feathered bipedal dinosaur dotted with crackling bionics.  Its curved claws glow menacingly.",
+    "special_when_hit": [ "ZAPBACK", 75 ],
+    "dissect": "dissect_CBM_DINO"
+  },
   {
     "type": "MONSTER",
     "id": "mon_gallimimus_bio_op",
@@ -133,6 +158,56 @@
     "special_when_hit": [ "ZAPBACK", 75 ],
     "dissect": "dissect_CBM_DINO"
   },
+  {
+    "type": "MONSTER",
+    "id": "mon_struthiomimus_bio_op",
+    "name": { "str_sp": "struthiomimus bio-operator" },
+    "copy-from": "mon_struthiomimus",
+    "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, "cut": 3, "bullet": 3 }
+    },
+    "extend": { "flags": [ "ACIDPROOF", "ELECTRIC" ] },
+    "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
+    "vision_day": 100,
+    "luminance": 4,
+    "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ],
+    "zombify_into": "mon_ztruthiomimus_bio_op",
+    "description": "A fast-moving feathered bipedal dinosaur dotted with crackling bionics.  Its curved claws glow menacingly.",
+    "special_when_hit": [ "ZAPBACK", 75 ],
+    "dissect": "dissect_CBM_DINO"
+  },
+  {
+    "type": "MONSTER",
+    "id": "mon_ornithomimus_bio_op",
+    "name": { "str_sp": "ornithomimus bio-operator" },
+    "copy-from": "mon_ornithomimus",
+    "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, "cut": 3, "bullet": 3 }
+    },
+    "extend": { "flags": [ "ACIDPROOF", "ELECTRIC" ] },
+    "melee_damage": [ { "damage_type": "electric", "amount": 4 } ],
+    "vision_day": 100,
+    "luminance": 4,
+    "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ],
+    "zombify_into": "mon_zornithomimus_bio_op",
+    "description": "A fast-moving feathered bipedal dinosaur dotted with crackling bionics.  Its curved claws glow menacingly.",
+    "special_when_hit": [ "ZAPBACK", 75 ],
+    "dissect": "dissect_CBM_DINO"
+  },
   {
     "type": "MONSTER",
     "id": "mon_albertonykus_bio_op",

data/mods/DinoMod/monsters/fungus.json

@@ -315,6 +315,25 @@
     "upgrades": false,
     "flags": [ "SEES", "POISON", "STUMBLES", "BASHES", "DESTROYS", "NO_BREATHE", "FILTHY", "WARM" ]
   },
+  {
+    "id": "mon_zedcolbertia_fungus",
+    "type": "MONSTER",
+    "name": { "str": "fungal nedcolbertia zombie" },
+    "description": "Once a feathered, plant-eating, bipedal dinosaur, fungal tendrils now sprout from its mouth, eyes, and other orifices, holding together an enormous shambling mass of mold-covered feathers.",
+    "copy-from": "mon_zedcolbertia",
+    "default_faction": "fungus",
+    "species": [ "FUNGUS" ],
+    "diff": 2,
+    "proportional": { "hp": 0.75, "speed": 0.65 },
+    "color": "light_gray",
+    "relative": { "melee_skill": -1, "melee_dice": -1, "melee_dice_sides": 3, "armor": { "bash": 3 } },
+    "bleed_rate": 0,
+    "vision_day": 5,
+    "vision_night": 5,
+    "special_attacks": [ [ "FUNGUS", 200 ], [ "scratch", 10 ], { "type": "bite", "cooldown": 5 } ],
+    "upgrades": false,
+    "flags": [ "SEES", "HEARS", "PET_MOUNTABLE", "POISON", "STUMBLES", "NO_BREATHE", "FILTHY", "WARM" ]
+  },
   {
     "id": "mon_zallimimus_fungus",
     "type": "MONSTER",