From 5b606dc8a15519fa3d18b5e0066aafbb2d7d2d3a Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 09:50:12 -0500 Subject: [PATCH 01/27] [DinoMod] nedcolbertia --- data/mods/DinoMod/items/egg.json | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json index c510b1bcddaa1..06909b6ce2674 100644 --- a/data/mods/DinoMod/items/egg.json +++ b/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", From 1d7dec2ca84a4a06fb14ac44b53026eb9b1b0328 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 09:58:34 -0500 Subject: [PATCH 02/27] Update hatchling.json --- data/mods/DinoMod/monsters/hatchling.json | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/data/mods/DinoMod/monsters/hatchling.json b/data/mods/DinoMod/monsters/hatchling.json index f44a2491ce107..7374a5f5f6df9 100644 --- a/data/mods/DinoMod/monsters/hatchling.json +++ b/data/mods/DinoMod/monsters/hatchling.json @@ -183,13 +183,13 @@ "harvest": "bird_tiny" }, { - "id": "mon_gallimimus_hatchling", + "id": "mon_nedcolbertia_hatchling", "type": "MONSTER", "copy-from": "mon_dilophosaurus_hatchling", "name": "light green and yellow hatchling", "default_faction": "herbivore_young", "color": "light_green_yellow", - "upgrades": { "age_grow": 20, "into": "mon_gallimimus_juvenile" }, + "upgrades": { "age_grow": 20, "into": "mon_nedcolbertia_juvenile" }, "death_function": { "effect": { "id": "death_guilt", "min_level": 3 } }, "petfood": { "food": [ "DINOFOOD_A", "DINOFOOD_B", "DINOFOOD_C" ] }, "flags": [ @@ -205,6 +205,12 @@ "GUILT_ANIMAL" ] }, + { + "id": "mon_gallimimus_hatchling", + "type": "MONSTER", + "copy-from": "mon_nedcolbertia_hatchling", + "upgrades": { "age_grow": 20, "into": "mon_gallimimus_juvenile" } + }, { "id": "mon_struthiomimus_hatchling", "type": "MONSTER", From b9868f293ff80bfaf758633eda09f170a55d5226 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 10:13:08 -0500 Subject: [PATCH 03/27] Update juvenile.json --- data/mods/DinoMod/monsters/juvenile.json | 42 +++++++++++++++++------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/data/mods/DinoMod/monsters/juvenile.json b/data/mods/DinoMod/monsters/juvenile.json index e571f4a46620b..88daf03049e0e 100644 --- a/data/mods/DinoMod/monsters/juvenile.json +++ b/data/mods/DinoMod/monsters/juvenile.json @@ -265,17 +265,17 @@ "extend": { "flags": [ "CANPLAY", "NO_BREED" ] } }, { - "id": "mon_gallimimus_juvenile", + "id": "mon_nedcolbertia_juvenile", "type": "MONSTER", "name": "greenish yellow two-legged juvenile", - "description": "A small two-legged dinosaur juvenile with huge shiny eyes, it could be from a number of different species.", + "description": "A small two-legged dinosaur juvenile with feathers, it could be from a number of different species.", "default_faction": "herbivore_young", "categories": [ "DINOSAUR", "WILDLIFE" ], "species": [ "DINOSAUR" ], - "volume": "10 L", - "weight": "10 kg", - "hp": 10, - "speed": 60, + "volume": "25 L", + "weight": "25 kg", + "hp": 40, + "speed": 100, "material": [ "flesh" ], "symbol": "v", "color": "light_gray", @@ -286,12 +286,33 @@ "melee_dice": 1, "melee_dice_sides": 1, "melee_damage": [ { "damage_type": "cut", "amount": 1 } ], - "dodge": 2, - "upgrades": { "age_grow": 70, "into": "mon_gallimimus" }, + "dodge": 6, + "upgrades": { "age_grow": 70, "into": "mon_nedcolbertia" }, "biosignature": { "biosig_item": "feces_dino", "biosig_timer": 3 }, "petfood": { "food": [ "DINOFOOD_A", "DINOFOOD_B", "DINOFOOD_C" ] }, - "flags": [ "SEES", "HEARS", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "NO_BREED", "CANPLAY", "CAN_BE_CULLED" ], - "harvest": "bird_small" + "flags": [ + "SEES", + "HEARS", + "ANIMAL", + "PATH_AVOID_DANGER", + "PET_MOUNTABLE", + "WARM", + "NO_BREED", + "CANPLAY", + "CAN_BE_CULLED", + "EATS" + ], + "harvest": "dino_feather_leather" + }, + { + "id": "mon_gallimimus_juvenile", + "type": "MONSTER", + "copy-from": "mon_nedcolbertia_juvenile", + "description": "A small bipedal dinosaur juvenile with feathers and a beak, it could be from a number of different species.", + "volume": "220 L", + "weight": "220 kg", + "hp": 55, + "upgrades": { "age_grow": 70, "into": "mon_gallimimus" } }, { "id": "mon_struthiomimus_juvenile", @@ -328,7 +349,6 @@ { "id": "mon_anzu_juvenile", "type": "MONSTER", - "description": "A small bipedal dinosaur juvenile with huge shiny eyes and a beak, it could be from a number of different species.", "copy-from": "mon_falcarius_juvenile", "default_faction": "anzu_juvenile", "upgrades": { "age_grow": 365, "into": "mon_anzu" }, From 331d46c84f74eea0b12ffd731879828d793e387a Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 10:57:17 -0500 Subject: [PATCH 04/27] Update dinosaur.json --- data/mods/DinoMod/monsters/dinosaur.json | 36 ++++++++++++++++-------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index 8d7a5fce3a885..39dc94d05d8e7 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -641,22 +641,22 @@ }, { "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, @@ -664,10 +664,10 @@ "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", From 176f930d091ea1186971bf8dc3c170d2a8dfbde6 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 11:21:22 -0500 Subject: [PATCH 05/27] Update dinosaur_CBM.json --- data/mods/DinoMod/monsters/dinosaur_CBM.json | 75 ++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/data/mods/DinoMod/monsters/dinosaur_CBM.json b/data/mods/DinoMod/monsters/dinosaur_CBM.json index 52af6fff5f772..e6c2d43439950 100644 --- a/data/mods/DinoMod/monsters/dinosaur_CBM.json +++ b/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", From e67033aa8ff4af286ae1c77ac83cb772f45bd173 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 11:44:58 -0500 Subject: [PATCH 06/27] Update juvenile.json --- data/mods/DinoMod/monsters/juvenile.json | 61 +++++++++++++++--------- 1 file changed, 39 insertions(+), 22 deletions(-) diff --git a/data/mods/DinoMod/monsters/juvenile.json b/data/mods/DinoMod/monsters/juvenile.json index 88daf03049e0e..13f398ed63235 100644 --- a/data/mods/DinoMod/monsters/juvenile.json +++ b/data/mods/DinoMod/monsters/juvenile.json @@ -312,19 +312,22 @@ "volume": "220 L", "weight": "220 kg", "hp": 55, - "upgrades": { "age_grow": 70, "into": "mon_gallimimus" } + "upgrades": { "age_grow": 70, "into": "mon_gallimimus" }, + "zombify_into": "mon_zallimimus_juvenile" }, { "id": "mon_struthiomimus_juvenile", "type": "MONSTER", "copy-from": "mon_gallimimus_juvenile", - "upgrades": { "age_grow": 70, "into": "mon_struthiomimus" } + "upgrades": { "age_grow": 70, "into": "mon_struthiomimus" }, + "zombify_into": "mon_ztruthiomimus_juvenile" }, { "id": "mon_ornithomimus_juvenile", "type": "MONSTER", "copy-from": "mon_gallimimus_juvenile", - "upgrades": { "age_grow": 365, "into": "mon_ornithomimus" } + "upgrades": { "age_grow": 365, "into": "mon_ornithomimus" }, + "zombify_into": "mon_zornithomimus_juvenile" }, { "id": "mon_falcarius_juvenile", @@ -332,49 +335,63 @@ "name": "green and magenta two-legged juvenile", "description": "A small bipedal plant-eating dinosaur juvenile, it could be from a number of different species.", "copy-from": "mon_gallimimus_juvenile", - "upgrades": { "age_grow": 365, "into": "mon_falcarius" } + "volume": "50 L", + "weight": "50 kg", + "hp": 75, + "upgrades": { "age_grow": 50, "into": "mon_falcarius" }, + "zombify_into": "mon_zalcarius" }, { "id": "mon_therizinosaurus_juvenile", "type": "MONSTER", - "copy-from": "mon_falcarius_juvenile", - "upgrades": { "age_grow": 365, "into": "mon_therizinosaurus" } + "copy-from": "mon_therizinosaurus", + "hp": 250, + "upgrades": { "age_grow": 365, "into": "mon_therizinosaurus" }, + "extend": { "flags": [ "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] } }, { "id": "mon_nothronychus_juvenile", "type": "MONSTER", - "copy-from": "mon_falcarius_juvenile", - "upgrades": { "age_grow": 365, "into": "mon_nothronychus" } + "copy-from": "mon_nothronychus", + "volume": "400 L", + "weight": "400 kg", + "hp": 80, + "upgrades": { "age_grow": 365, "into": "mon_nothronychus" }, + "extend": { "flags": [ "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] } }, { "id": "mon_anzu_juvenile", "type": "MONSTER", - "copy-from": "mon_falcarius_juvenile", + "copy-from": "mon_anzu", + "volume": "250 L", + "weight": "250 kg", + "hp": 60, "default_faction": "anzu_juvenile", "upgrades": { "age_grow": 365, "into": "mon_anzu" }, - "petfood": { "food": [ "DINOFOOD_A", "DINOFOOD_B", "DINOFOOD_C" ] } + "petfood": { "food": [ "DINOFOOD_A", "DINOFOOD_B", "DINOFOOD_C" ] }, + "extend": { "flags": [ "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] } }, { "id": "mon_deinonychus_juvenile", "type": "MONSTER", - "name": "red and green two-legged juvenile", - "description": "A small bipedal meat-eating dinosaur juvenile with huge shiny eyes, it could be from a number of different species.", "default_faction": "deinonychus_juvenile", - "copy-from": "mon_gallimimus_juvenile", - "color": "red_green", - "upgrades": { "age_grow": 14, "into": "mon_deinonychus" }, - "petfood": { "food": [ "DINOFOOD_B" ] }, - "dissect": "dissect_raptor_sample_single", - "flags": [ "SEES", "HEARS", "SMELLS", "KEENNOSE", "ANIMAL", "PATH_AVOID_DANGER", "WARM", "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] + "copy-from": "mon_deinonychus", + "volume": "50 L", + "weight": "50 kg", + "hp": 30, + "upgrades": { "age_grow": 100, "into": "mon_deinonychus" }, + "extend": { "flags": [ "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] } }, { "id": "mon_utahraptor_juvenile", "type": "MONSTER", - "name": "gray and white two-legged juvenile", "default_faction": "utahraptor_juvenile", - "copy-from": "mon_deinonychus_juvenile", - "color": "dark_gray_white", - "upgrades": { "age_grow": 80, "into": "mon_utahraptor" } + "copy-from": "mon_utahraptor", + "volume": "250 L", + "weight": "250 kg", + "hp": 75, + "upgrades": { "age_grow": 100, "into": "mon_utahraptor" }, + "extend": { "flags": [ "CANPLAY", "NO_BREED", "CAN_BE_CULLED" ] } }, { "id": "mon_sarahsaurus_juvenile", From 5fd3e69f6868a70ca864796f5cade9e806e9efd3 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Fri, 29 Nov 2024 14:01:16 -0500 Subject: [PATCH 07/27] Update dictionary.txt --- tools/spell_checker/dictionary.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/spell_checker/dictionary.txt b/tools/spell_checker/dictionary.txt index 9417cc25d5930..b4dee958ca404 100644 --- a/tools/spell_checker/dictionary.txt +++ b/tools/spell_checker/dictionary.txt @@ -4201,6 +4201,7 @@ necrowolf nectivore Ned Nedarim +nedcolbertia Needham needlelike Needletip From f30d2936b582f041e4ffe25a85c67de485e3d1e9 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 00:35:40 -0500 Subject: [PATCH 08/27] Update zed-dinosaur_CBM.json --- .../DinoMod/monsters/zed-dinosaur_CBM.json | 56 ++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json b/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json index 335a4dfebedb0..f5c19c1fd11d0 100644 --- a/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json +++ b/data/mods/DinoMod/monsters/zed-dinosaur_CBM.json @@ -81,6 +81,24 @@ "upgrades": false, "dissect": "dissect_CBM_DINO" }, + { + "type": "MONSTER", + "id": "mon_zedcolbertia_bio_op", + "name": { "str": "nedcolbertia zombie bio-operator" }, + "copy-from": "mon_zedcolbertia", + "diff": 5, + "proportional": { "hp": 1.2, "speed": 1.15 }, + "relative": { "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": 50, + "luminance": 4, + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], + "description": "The shuffling corpse of a bipedal dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", + "special_when_hit": [ "ZAPBACK", 75 ], + "upgrades": false, + "dissect": "dissect_CBM_DINO" + }, { "type": "MONSTER", "id": "mon_zallimimus_bio_op", @@ -94,7 +112,43 @@ "vision_day": 50, "luminance": 4, "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], - "description": "The shuffling corpse of a bipedal dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", + "description": "The shuffling corpse of a bipedal beaked dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", + "special_when_hit": [ "ZAPBACK", 75 ], + "upgrades": false, + "dissect": "dissect_CBM_DINO" + }, + { + "type": "MONSTER", + "id": "mon_ztruthiomimus_bio_op", + "name": { "str": "struthiomimus zombie bio-operator" }, + "copy-from": "mon_ztruthiomimus", + "diff": 5, + "proportional": { "hp": 1.2, "speed": 1.15 }, + "relative": { "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": 50, + "luminance": 4, + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], + "description": "The shuffling corpse of a bipedal beaked dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", + "special_when_hit": [ "ZAPBACK", 75 ], + "upgrades": false, + "dissect": "dissect_CBM_DINO" + }, + { + "type": "MONSTER", + "id": "mon_zornithomimus_bio_op", + "name": { "str": "ornithomimus zombie bio-operator" }, + "copy-from": "mon_zornithomimus", + "diff": 5, + "proportional": { "hp": 1.2, "speed": 1.15 }, + "relative": { "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": 50, + "luminance": 4, + "special_attacks": [ { "id": "bio_op_takedown", "cooldown": 20 } ], + "description": "The shuffling corpse of a bipedal beaked dinosaur dotted with crackling bionics, tattered feathers, and black putrid liquid with glowing curved claws.", "special_when_hit": [ "ZAPBACK", 75 ], "upgrades": false, "dissect": "dissect_CBM_DINO" From ea9847655658d25ba6105ad3a4c0482c3b8a403d Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 10:40:16 -0500 Subject: [PATCH 09/27] Update zed-dinosaur.json --- data/mods/DinoMod/monsters/zed-dinosaur.json | 70 +++++++++++++++++--- 1 file changed, 59 insertions(+), 11 deletions(-) diff --git a/data/mods/DinoMod/monsters/zed-dinosaur.json b/data/mods/DinoMod/monsters/zed-dinosaur.json index 19de1701b6e93..b2ac8f0baa5c2 100644 --- a/data/mods/DinoMod/monsters/zed-dinosaur.json +++ b/data/mods/DinoMod/monsters/zed-dinosaur.json @@ -442,40 +442,55 @@ }, { "type": "MONSTER", - "id": "mon_zallimimus", - "name": { "str": "gallimimus zombie" }, - "looks_like": "mon_gallimimus", + "id": "mon_zedcolbertia", + "name": { "str": "nedcolbertia zombie" }, + "looks_like": "mon_nedcolbertia", "species": [ "ZOMBIE" ], "default_faction": "zombie", "symbol": "Z", "color": "green", - "volume": "440 L", - "weight": "440 kg", + "volume": "50 L", + "weight": "50 kg", "bodytype": "ostrich", "material": [ "flesh" ], "aggression": 100, "morale": 100, - "speed": 135, - "attack_cost": 135, + "speed": 130, + "attack_cost": 130, "melee_skill": 3, "melee_dice": 1, "melee_dice_sides": 4, "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], "weakpoint_sets": [ "wps_dinosaur_body" ], - "hp": 120, + "hp": 80, "grab_strength": 35, "special_attacks": [ { "id": "bite_grab" }, [ "scratch", 10 ], { "type": "bite", "cooldown": 10 } ], "description": "The shuffling corpse of a medium-sized bipedal dinosaur, covered with tattered feathers and black, putrid liquid.", - "burn_into": "mon_zallimimus_scorched", - "fungalize_into": "mon_zallimimus_fungus", - "upgrades": { "half_life": 30, "into_group": "GROUP_zallimimus_UPGRADE" }, + "burn_into": "mon_zedcolbertia_scorched", + "fungalize_into": "mon_zedcolbertia_fungus", + "upgrades": { "half_life": 30, "into_group": "GROUP_zedcolbertia_UPGRADE" }, "flags": [ "SEES", "HEARS", "GRABS", "PET_MOUNTABLE", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM" ], "vision_night": 3, "harvest": "zed_dino_feather", "categories": [ "DINOSAUR" ], "armor": { "bash": 2, "cut": 4, "bullet": 2 } }, + { + "type": "MONSTER", + "id": "mon_zallimimus", + "name": { "str": "gallimimus zombie" }, + "copy-from": "mon_zedcolbertia", + "looks_like": "mon_gallimimus", + "description": "The shuffling corpse of a medium-sized bipedal dinosaur with a beak, covered with tattered feathers and black, putrid liquid.", + "volume": "440 L", + "weight": "440 kg", + "speed": 135, + "attack_cost": 135, + "burn_into": "mon_zallimimus_scorched", + "fungalize_into": "mon_zallimimus_fungus", + "upgrades": { "half_life": 30, "into_group": "GROUP_zallimimus_UPGRADE" } + }, { "type": "MONSTER", "id": "mon_ztruthiomimus", @@ -1874,6 +1889,39 @@ ], "armor": { "bash": 5, "cut": 7, "bullet": 7 } }, + { + "type": "MONSTER", + "id": "mon_zallimimus_juvenile", + "name": { "str": "juvenile gallimimus zombie" }, + "copy-from": "mon_zallimimus", + "looks_like": "mon_gallimimus", + "upgrades": { "half_life": 30, "into": "mon_zallimimus" }, + "volume": "220 L", + "weight": "220 kg", + "hp": 60 + }, + { + "type": "MONSTER", + "id": "mon_ztruthiomimus_juvenile", + "name": { "str": "juvenile struthiomimus zombie" }, + "copy-from": "mon_ztruthiomimus", + "looks_like": "mon_gallimimus", + "upgrades": { "half_life": 30, "into": "mon_ztruthiomimus" }, + "volume": "220 L", + "weight": "220 kg", + "hp": 60 + }, + { + "type": "MONSTER", + "id": "mon_zornithomimus_juvenile", + "name": { "str": "juvenile ornithomimus zombie" }, + "copy-from": "mon_zornithomimus", + "looks_like": "mon_gallimimus", + "upgrades": { "half_life": 30, "into": "mon_zornithomimus" }, + "volume": "220 L", + "weight": "220 kg", + "hp": 60 + }, { "type": "MONSTER", "id": "mon_zarahsaurus_juvenile", From 47a08697e3eeb21740f59df80b759042626d0a9e Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 13:59:12 -0500 Subject: [PATCH 10/27] Update fungus.json --- data/mods/DinoMod/monsters/fungus.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/data/mods/DinoMod/monsters/fungus.json b/data/mods/DinoMod/monsters/fungus.json index 1626a9520f0f6..3d1c71a94167c 100644 --- a/data/mods/DinoMod/monsters/fungus.json +++ b/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", From f599d82cc9dc86333127a656496ab41afb988267 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 14:04:24 -0500 Subject: [PATCH 11/27] Update zinosaur_burned.json --- .../DinoMod/monsters/zinosaur_burned.json | 25 ++++++++++++++----- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/data/mods/DinoMod/monsters/zinosaur_burned.json b/data/mods/DinoMod/monsters/zinosaur_burned.json index 9c257760d9804..f95ae56affd3e 100644 --- a/data/mods/DinoMod/monsters/zinosaur_burned.json +++ b/data/mods/DinoMod/monsters/zinosaur_burned.json @@ -301,20 +301,20 @@ }, { "type": "MONSTER", - "id": "mon_zallimimus_scorched", - "name": { "str": "scorched gallimimus zombie" }, + "id": "mon_zedcolbertia_scorched", + "name": { "str": "scorched nedcolbertia zombie" }, "looks_like": "mon_zallimimus", "species": [ "ZOMBIE" ], "default_faction": "zombie", "symbol": "Z", - "volume": "440 L", - "weight": "440 kg", + "volume": "50 L", + "weight": "50 kg", "bodytype": "ostrich", "material": [ "flesh" ], "aggression": 100, "morale": 100, - "speed": 115, - "attack_cost": 115, + "speed": 120, + "attack_cost": 120, "melee_skill": 1, "melee_dice": 1, "melee_dice_sides": 3, @@ -348,11 +348,23 @@ ], "armor": { "bash": 4, "cut": 13, "acid": 3, "heat": 15, "bullet": 9 } }, + { + "type": "MONSTER", + "id": "mon_zallimimus_scorched", + "name": { "str_sp": "scorched gallimimus zombie" }, + "copy-from": "mon_zedcolbertia_scorched", + "fungalize_into": "mon_zallimimus_fungus", + "volume": "440 L", + "weight": "440 kg", + "speed": 115, + "attack_cost": 115 + }, { "type": "MONSTER", "id": "mon_ztruthiomimus_scorched", "name": { "str_sp": "scorched struthiomimus zombie" }, "copy-from": "mon_zallimimus_scorched", + "fungalize_into": "mon_ztruthiomimus_fungus", "volume": "420 L", "weight": "420 kg", "speed": 125, @@ -363,6 +375,7 @@ "id": "mon_zornithomimus_scorched", "name": { "str_sp": "scorched ornithomimus zombie" }, "copy-from": "mon_zallimimus_scorched", + "fungalize_into": "mon_zornithomimus_fungus", "volume": "170 L", "weight": "170 kg", "speed": 115, From 024ad72b5418247c47c065a94ecd34416f106b22 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 14:23:06 -0500 Subject: [PATCH 12/27] Update zinosaur_upgrade.json --- .../DinoMod/monsters/zinosaur_upgrade.json | 127 ++++++++++-------- 1 file changed, 72 insertions(+), 55 deletions(-) diff --git a/data/mods/DinoMod/monsters/zinosaur_upgrade.json b/data/mods/DinoMod/monsters/zinosaur_upgrade.json index 84d4211f8d23e..a3490bf8155d9 100644 --- a/data/mods/DinoMod/monsters/zinosaur_upgrade.json +++ b/data/mods/DinoMod/monsters/zinosaur_upgrade.json @@ -358,12 +358,35 @@ "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] }, "categories": [ "DINOSAUR" ] }, + { + "type": "MONSTER", + "id": "mon_zedcolbertia_brute", + "name": { "str_sp": "Nedcolbertia Knuckles" }, + "copy-from": "mon_zedcolbertia", + "description": "The shuffling corpse of a bipedal dinosaur covered with tattered feathers and black, putrid liquid. Its entire body bulges with distended muscles and swollen, festering wounds.", + "diff": 2, + "color": "red", + "proportional": { "hp": 1.5, "speed": 1.5 }, + "attack_cost": 202, + "relative": { + "melee_dice": 1, + "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], + "vision_night": 1, + "armor": { "bash": 4, "cut": 6, "bullet": 5 } + }, + "bleed_rate": 50, + "upgrades": false, + "special_attacks": [ [ "SMASH", 30 ] ], + "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] }, + "categories": [ "DINOSAUR" ] + }, { "type": "MONSTER", "id": "mon_zallimimus_brute", "name": { "str_sp": "Gruesome Gallimimus" }, "copy-from": "mon_zallimimus", - "description": "The shuffling corpse of a medium-sized bipedal dinosaur covered with tattered feathers and black, putrid liquid. Its entire body bulges with distended muscles and swollen, festering wounds.", + "description": "The shuffling corpse of a bipedal beaked dinosaur covered with tattered feathers and black, putrid liquid. Its entire body bulges with distended muscles and swollen, festering wounds.", "diff": 2, "color": "red", "proportional": { "hp": 1.5, "speed": 1.5 }, @@ -2197,6 +2220,19 @@ "categories": [ "DINOSAUR" ], "armor": { "bash": 6, "cut": 8 } }, + { + "type": "MONSTER", + "id": "mon_zedcolbertia_shady", + "name": { "str": "shady nedcolbertia zombie" }, + "color": "light_gray", + "description": "An uncanny shadow envelops this creature. You can make out the outline of a bipedal dinosaur with feathery edges.", + "upgrades": { "half_life": 15, "into": "mon_zedcolbertia_nightstalker" }, + "vision_day": 3, + "vision_night": 40, + "copy-from": "mon_zedcolbertia", + "looks_like": "mon_gallimimus", + "extend": { "flags": [ "NIGHT_INVISIBILITY" ] } + }, { "type": "MONSTER", "id": "mon_zallimimus_shady", @@ -2206,73 +2242,34 @@ "upgrades": { "half_life": 15, "into": "mon_zallimimus_nightstalker" }, "vision_day": 3, "vision_night": 40, + "copy-from": "mon_zallimimus", "looks_like": "mon_gallimimus", - "species": [ "ZOMBIE" ], - "default_faction": "zombie", - "symbol": "Z", - "volume": "440 L", - "weight": "440 kg", - "bodytype": "ostrich", - "material": [ "flesh" ], - "aggression": 100, - "morale": 100, - "speed": 135, - "attack_cost": 135, - "melee_skill": 3, - "melee_dice": 1, - "melee_dice_sides": 4, - "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], - "families": [ "prof_gross_anatomy", "prof_intro_biology", "prof_physiology", "prof_wp_zombie" ], - "weakpoint_sets": [ "wps_dinosaur_body" ], - "hp": 120, - "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab" }, { "type": "bite", "cooldown": 5 } ], - "burn_into": "mon_zallimimus_scorched", - "fungalize_into": "mon_zallimimus_fungus", - "flags": [ - "SEES", - "HEARS", - "GRABS", - "PET_MOUNTABLE", - "POISON", - "STUMBLES", - "NO_BREATHE", - "REVIVES", - "FILTHY", - "WARM", - "NIGHT_INVISIBILITY" - ], - "harvest": "zed_dino_feather", - "categories": [ "DINOSAUR" ], - "armor": { "bash": 2, "cut": 4, "bullet": 2 } + "extend": { "flags": [ "NIGHT_INVISIBILITY" ] } }, { "type": "MONSTER", "id": "mon_ztruthiomimus_shady", "name": { "str_sp": "shady struthiomimus zombie" }, - "copy-from": "mon_zallimimus_shady", + "color": "light_gray", + "description": "An uncanny shadow envelops this creature. You can make out the outline of a bipedal dinosaur with feathery edges and a beak.", + "copy-from": "mon_ztruthiomimus", + "looks_like": "mon_gallimimus", "upgrades": { "half_life": 15, "into": "mon_ztruthiomimus_nightstalker" }, - "volume": "420 L", - "weight": "420 kg", - "speed": 140, - "attack_cost": 140, - "burn_into": "mon_ztruthiomimus_scorched", - "fungalize_into": "mon_ztruthiomimus_fungus", - "categories": [ "DINOSAUR" ] + "vision_day": 3, + "vision_night": 40, + "extend": { "flags": [ "NIGHT_INVISIBILITY" ] } }, { "type": "MONSTER", "id": "mon_zornithomimus_shady", "name": { "str_sp": "shady ornithomimus zombie" }, - "copy-from": "mon_zallimimus_shady", + "copy-from": "mon_zornithomimus", "upgrades": { "half_life": 15, "into": "mon_zornithomimus_nightstalker" }, - "volume": "170 L", - "weight": "170 kg", - "speed": 125, - "attack_cost": 125, - "burn_into": "mon_zornithomimus_scorched", - "fungalize_into": "mon_zornithomimus_fungus", - "extend": { "flags": [ "CLIMBS" ] }, - "categories": [ "DINOSAUR" ] + "color": "light_gray", + "description": "An uncanny shadow envelops this creature. You can make out the outline of a bipedal dinosaur with feathery edges and a beak.", + "vision_day": 3, + "vision_night": 40, + "extend": { "flags": [ "NIGHT_INVISIBILITY" ] } }, { "type": "MONSTER", @@ -2836,6 +2833,26 @@ "upgrades": false, "categories": [ "DINOSAUR" ] }, + { + "type": "MONSTER", + "id": "mon_zedcolbertia_nightstalker", + "name": { "str_sp": "nedcolbertia nightstalker" }, + "copy-from": "mon_zedcolbertia_shady", + "diff": 2, + "proportional": { "hp": 1.5, "speed": 1.5 }, + "relative": { + "melee_dice": 1, + "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "stab", "amount": 2 } ], + "vision_night": 1, + "armor": { "bash": 4, "cut": 6, "bullet": 5 } + }, + "bleed_rate": 50, + "special_attacks": [ [ "SMASH", 30 ] ], + "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH", "SMELLS" ] }, + "upgrades": false, + "categories": [ "DINOSAUR" ] + }, { "type": "MONSTER", "id": "mon_zallimimus_nightstalker", From b74c53e89d44ee1def21135919dd3033217fe1a2 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 15:21:33 -0500 Subject: [PATCH 13/27] Update monstergroups_egg.json --- data/mods/DinoMod/monstergroups/monstergroups_egg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/monstergroups/monstergroups_egg.json b/data/mods/DinoMod/monstergroups/monstergroups_egg.json index 97aaffa12303f..a8e2f1d901e7a 100644 --- a/data/mods/DinoMod/monstergroups/monstergroups_egg.json +++ b/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 }, From e7bebf31098575d08c11df4f625ae963df6ef419 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 15:24:51 -0500 Subject: [PATCH 14/27] Update zinosaur.json groups --- data/mods/DinoMod/monstergroups/zinosaur.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/mods/DinoMod/monstergroups/zinosaur.json b/data/mods/DinoMod/monstergroups/zinosaur.json index 8fa8764eb271b..10865f5a00280 100644 --- a/data/mods/DinoMod/monstergroups/zinosaur.json +++ b/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", From 580030b147d4b0b5051a2e2e16d96af63bc8e438 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 15:27:12 -0500 Subject: [PATCH 15/27] skeletal --- .../mods/DinoMod/monsters/zinosaur_upgrade.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/data/mods/DinoMod/monsters/zinosaur_upgrade.json b/data/mods/DinoMod/monsters/zinosaur_upgrade.json index a3490bf8155d9..08bf284fd0f06 100644 --- a/data/mods/DinoMod/monsters/zinosaur_upgrade.json +++ b/data/mods/DinoMod/monsters/zinosaur_upgrade.json @@ -3344,6 +3344,23 @@ "melee_damage": [ { "damage_type": "cut", "amount": 25 } ], "special_attacks": [ [ "scratch", 10 ], { "id": "bite_grab", "cooldown": 7 }, { "id": "teeth_zino_max", "cooldown": 5 } ] }, + { + "type": "MONSTER", + "id": "mon_sedcolbertia", + "name": { "str_sp": "skeletal nedcolbertia" }, + "copy-from": "mon_silophosaurus", + "description": "Monstrous columns of dense bone covering feathers and claws, cracks dripping black goo.", + "volume": "50 L", + "weight": "50 kg", + "speed": 120, + "attack_cost": 118, + "hp": 50, + "melee_skill": 3, + "melee_dice": 2, + "melee_dice_sides": 7, + "melee_damage": [ { "damage_type": "bash", "amount": 6 } ], + "upgrades": { "half_life": 15, "into": "mon_sallimimus_brute" } + }, { "type": "MONSTER", "id": "mon_sallimimus", From 592f204286e40e669f40d2a2ef11ce0a4626b7be Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:23:32 -0500 Subject: [PATCH 16/27] Update dinosaur.json groups --- data/mods/DinoMod/monstergroups/dinosaur.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/mods/DinoMod/monstergroups/dinosaur.json b/data/mods/DinoMod/monstergroups/dinosaur.json index 508b1869d7ad8..c88f346f02676 100644 --- a/data/mods/DinoMod/monstergroups/dinosaur.json +++ b/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 ] }, From ff8e536400b3adb4583fac360ff7e85315470b1b Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:24:39 -0500 Subject: [PATCH 17/27] Update fungi.json groups --- data/mods/DinoMod/monstergroups/fungi.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/monstergroups/fungi.json b/data/mods/DinoMod/monstergroups/fungi.json index b4ef43ba3efd1..9b5b4f7c401e0 100644 --- a/data/mods/DinoMod/monstergroups/fungi.json +++ b/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" }, From df63e68f4333f8a991016911375a34ade875094d Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:30:38 -0500 Subject: [PATCH 18/27] Update lab.json groups --- data/mods/DinoMod/monstergroups/lab.json | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monstergroups/lab.json b/data/mods/DinoMod/monstergroups/lab.json index 7b7882ce4df8f..07715393aee60 100644 --- a/data/mods/DinoMod/monstergroups/lab.json +++ b/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" }, From 0645d362c1edde5bb1477bce3a76ceab0fe5c11c Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:31:41 -0500 Subject: [PATCH 19/27] update safe group --- data/mods/DinoMod/monstergroups/misc.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/monstergroups/misc.json b/data/mods/DinoMod/monstergroups/misc.json index 123bb34ae6131..cdc7c6134d8bd 100644 --- a/data/mods/DinoMod/monstergroups/misc.json +++ b/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 ] }, From 0f8481b25117aac554a5e071e69ca5b2bcfa154a Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:32:57 -0500 Subject: [PATCH 20/27] Update wilderness.json --- data/mods/DinoMod/monstergroups/wilderness.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/monstergroups/wilderness.json b/data/mods/DinoMod/monstergroups/wilderness.json index 772ab28bddf82..58f8f3e9d68f0 100644 --- a/data/mods/DinoMod/monstergroups/wilderness.json +++ b/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 ] }, From 7aa5c64cd559bb54960a158fe77015537ed4488d Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:35:04 -0500 Subject: [PATCH 21/27] Update cooking_components.json --- data/mods/DinoMod/requirements/cooking_components.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/requirements/cooking_components.json b/data/mods/DinoMod/requirements/cooking_components.json index 4f9f92eac6716..605e85fa6c50c 100644 --- a/data/mods/DinoMod/requirements/cooking_components.json +++ b/data/mods/DinoMod/requirements/cooking_components.json @@ -25,6 +25,7 @@ [ "egg_qianzhousaurus", 1 ], [ "egg_nanuqsaurus", 1 ], [ "egg_daspletosaurus", 1 ], + [ "egg_nedcolbertia", 1 ], [ "egg_gallimimus", 1 ], [ "egg_struthiomimus", 1 ], [ "egg_ornithomimus", 1 ], From 679e1c2586904c77c374911fe37d6e260274690b Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:40:26 -0500 Subject: [PATCH 22/27] Create nest_nedcolbertia.json --- .../mapgen/map_extras/nest_nedcolbertia.json | 77 +++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 data/mods/DinoMod/mapgen/map_extras/nest_nedcolbertia.json diff --git a/data/mods/DinoMod/mapgen/map_extras/nest_nedcolbertia.json b/data/mods/DinoMod/mapgen/map_extras/nest_nedcolbertia.json new file mode 100644 index 0000000000000..d2421b7896af6 --- /dev/null +++ b/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 } ] + } + } +] From 2afc1cf9fe805af70a46f52556e9e269da5c7863 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:42:21 -0500 Subject: [PATCH 23/27] Update map_extras.json --- data/mods/DinoMod/overmap/map_extras.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/data/mods/DinoMod/overmap/map_extras.json b/data/mods/DinoMod/overmap/map_extras.json index ee378072a1519..f39eaf2e6652f 100644 --- a/data/mods/DinoMod/overmap/map_extras.json +++ b/data/mods/DinoMod/overmap/map_extras.json @@ -484,6 +484,17 @@ "autonote": true, "flags": [ "CLASSIC" ] }, + { + "id": "mx_nest_nedcolbertia", + "type": "map_extra", + "name": { "str": "nedcolbertia nest" }, + "description": "A nedcolbertia nest.", + "generator": { "generator_method": "update_mapgen", "generator_id": "mx_nest_nedcolbertia" }, + "sym": "D", + "color": "light_green", + "autonote": true, + "flags": [ "CLASSIC" ] + }, { "id": "mx_nest_nodosaurus", "type": "map_extra", From a087efef2304c39e8cbaf4836aa19f9822c4dcaf Mon Sep 17 00:00:00 2001 From: LyleSY Date: Sat, 30 Nov 2024 18:47:04 -0500 Subject: [PATCH 24/27] Update regional_overlay.json --- data/mods/DinoMod/regional_overlay.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/mods/DinoMod/regional_overlay.json b/data/mods/DinoMod/regional_overlay.json index f9b3cf1ccc6d8..9eb47026480f0 100644 --- a/data/mods/DinoMod/regional_overlay.json +++ b/data/mods/DinoMod/regional_overlay.json @@ -40,6 +40,7 @@ "forest": { "chance": 20, "extras": { + "mx_nest_nedcolbertia": 30, "mx_nest_gallimimus": 30, "mx_nest_struthiomimus": 30, "mx_nest_ornithomimus": 30, From 209ac6cc27ee68ca57ab00ddbf8e71e3720a7154 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 2 Dec 2024 08:46:48 -0500 Subject: [PATCH 25/27] Update data/mods/DinoMod/monsters/dinosaur_CBM.json Co-authored-by: Anton Burmistrov --- data/mods/DinoMod/monsters/dinosaur_CBM.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monsters/dinosaur_CBM.json b/data/mods/DinoMod/monsters/dinosaur_CBM.json index e6c2d43439950..bf6fdeb148f8f 100644 --- a/data/mods/DinoMod/monsters/dinosaur_CBM.json +++ b/data/mods/DinoMod/monsters/dinosaur_CBM.json @@ -111,7 +111,7 @@ { "type": "MONSTER", "id": "mon_nedcolbertia_bio_op", - "name": { "str_sp": "nedcolbertia bio-operator" }, + "name": { "str": "nedcolbertia bio-operator" }, "copy-from": "mon_nedcolbertia", "diff": 5, "proportional": { "hp": 1.2, "speed": 1.15 }, From 8a17eea352da341b32d3ffaec72071e88ba48ef6 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 2 Dec 2024 08:46:56 -0500 Subject: [PATCH 26/27] Update data/mods/DinoMod/monsters/dinosaur_CBM.json Co-authored-by: Anton Burmistrov --- data/mods/DinoMod/monsters/dinosaur_CBM.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monsters/dinosaur_CBM.json b/data/mods/DinoMod/monsters/dinosaur_CBM.json index bf6fdeb148f8f..cbfdf4aa8f1d0 100644 --- a/data/mods/DinoMod/monsters/dinosaur_CBM.json +++ b/data/mods/DinoMod/monsters/dinosaur_CBM.json @@ -161,7 +161,7 @@ { "type": "MONSTER", "id": "mon_struthiomimus_bio_op", - "name": { "str_sp": "struthiomimus bio-operator" }, + "name": { "str": "struthiomimus bio-operator" }, "copy-from": "mon_struthiomimus", "diff": 5, "proportional": { "hp": 1.2, "speed": 1.15 }, From fddb87e3c0f2bfeb1e1986e2f3e42b0258e9f801 Mon Sep 17 00:00:00 2001 From: LyleSY Date: Mon, 2 Dec 2024 08:47:01 -0500 Subject: [PATCH 27/27] Update data/mods/DinoMod/monsters/dinosaur_CBM.json Co-authored-by: Anton Burmistrov --- data/mods/DinoMod/monsters/dinosaur_CBM.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/DinoMod/monsters/dinosaur_CBM.json b/data/mods/DinoMod/monsters/dinosaur_CBM.json index cbfdf4aa8f1d0..d30c396928ca6 100644 --- a/data/mods/DinoMod/monsters/dinosaur_CBM.json +++ b/data/mods/DinoMod/monsters/dinosaur_CBM.json @@ -186,7 +186,7 @@ { "type": "MONSTER", "id": "mon_ornithomimus_bio_op", - "name": { "str_sp": "ornithomimus bio-operator" }, + "name": { "str": "ornithomimus bio-operator" }, "copy-from": "mon_ornithomimus", "diff": 5, "proportional": { "hp": 1.2, "speed": 1.15 },