diff --git a/data/mods/DinoMod/DESIGN.md b/data/mods/DinoMod/DESIGN.md index 4ca9d2fdfdbdf..c493a113359b1 100644 --- a/data/mods/DinoMod/DESIGN.md +++ b/data/mods/DinoMod/DESIGN.md @@ -22,7 +22,7 @@ As of this writing, each dinosaur touches at least ten different JSON files, lis Main DinoMod folder: -* monster_factions.json is where custom dino factions go. Plant eaters are pretty simple but predators have three each usually to manage famiies +* monster_factions.json is where custom dino factions go. Plant eaters are pretty simple but predators have three each usually to manage families items folder: diff --git a/data/mods/DinoMod/items/egg.json b/data/mods/DinoMod/items/egg.json index 242b7a799bf73..92c2e4d0e50e2 100644 --- a/data/mods/DinoMod/items/egg.json +++ b/data/mods/DinoMod/items/egg.json @@ -534,6 +534,13 @@ "copy-from": "egg_dino", "rot_spawn": "GROUP_EGG_camptosaurus" }, + { + "type": "COMESTIBLE", + "id": "egg_iguanodon", + "name": "iguanodon egg", + "copy-from": "egg_dino", + "rot_spawn": "GROUP_EGG_iguanodon" + }, { "type": "COMESTIBLE", "id": "egg_hadrosaurus", diff --git a/data/mods/DinoMod/monstergroups/dinosaur.json b/data/mods/DinoMod/monstergroups/dinosaur.json index d2461c61cfc1f..0141cb60e5578 100644 --- a/data/mods/DinoMod/monstergroups/dinosaur.json +++ b/data/mods/DinoMod/monstergroups/dinosaur.json @@ -15,9 +15,9 @@ "type": "monstergroup", "name": "GROUP_DINOSAUR_SOUTH_AMERICA", "monsters": [ - { "monster": "mon_eoraptor", "weight": 20, "cost_multiplier": 0, "pack_size": [ 4, 12 ] }, + { "monster": "mon_eoraptor", "weight": 20, "cost_multiplier": 0, "pack_size": [ 1, 2 ] }, { "monster": "mon_giganotosaurus", "weight": 10, "cost_multiplier": 40, "pack_size": [ 1, 2 ] }, - { "monster": "mon_amargasaurus", "weight": 5, "cost_multiplier": 25, "pack_size": [ 4, 12 ] } + { "monster": "mon_amargasaurus", "weight": 5, "cost_multiplier": 25, "pack_size": [ 1, 2 ] } ] }, { @@ -26,13 +26,16 @@ "monsters": [ { "monster": "mon_qianzhousaurus", "weight": 200, "cost_multiplier": 40, "pack_size": [ 1, 2 ] }, { "monster": "mon_therizinosaurus", "weight": 200, "cost_multiplier": 30, "pack_size": [ 1, 2 ] }, - { "monster": "mon_velociraptor", "weight": 200, "cost_multiplier": 10, "pack_size": [ 2, 4 ] } + { "monster": "mon_velociraptor", "weight": 200, "cost_multiplier": 10, "pack_size": [ 1, 2 ] } ] }, { "type": "monstergroup", "name": "GROUP_DINOSAUR_EUROPE", - "monsters": [ { "monster": "mon_compsognathus", "weight": 100, "cost_multiplier": 40, "pack_size": [ 4, 12 ] } ] + "monsters": [ + { "monster": "mon_compsognathus", "weight": 100, "cost_multiplier": 40, "pack_size": [ 1, 2 ] }, + { "monster": "mon_iguanodon", "weight": 100, "pack_size": [ 1, 2 ] } + ] }, { "type": "monstergroup", diff --git a/data/mods/DinoMod/monstergroups/monstergroups_egg.json b/data/mods/DinoMod/monstergroups/monstergroups_egg.json index d298216be067b..9f9070b3e49c1 100644 --- a/data/mods/DinoMod/monstergroups/monstergroups_egg.json +++ b/data/mods/DinoMod/monstergroups/monstergroups_egg.json @@ -427,6 +427,11 @@ "type": "monstergroup", "monsters": [ { "monster": "mon_camptosaurus_hatchling" } ] }, + { + "name": "GROUP_EGG_iguanodon", + "type": "monstergroup", + "monsters": [ { "monster": "mon_iguanodon_hatchling" } ] + }, { "name": "GROUP_EGG_hadrosaurus", "type": "monstergroup", diff --git a/data/mods/DinoMod/monstergroups/zinosaur.json b/data/mods/DinoMod/monstergroups/zinosaur.json index 86d46255fdf1d..2177882e868c1 100644 --- a/data/mods/DinoMod/monstergroups/zinosaur.json +++ b/data/mods/DinoMod/monstergroups/zinosaur.json @@ -515,6 +515,11 @@ "name": "GROUP_zamptosaurus_UPGRADE", "monsters": [ { "monster": "mon_samptosaurus", "weight": 600 }, { "monster": "mon_zamptosaurus_brute", "weight": 400 } ] }, + { + "type": "monstergroup", + "name": "GROUP_ziguanodon_UPGRADE", + "monsters": [ { "monster": "mon_siguanodon", "weight": 600 }, { "monster": "mon_ziguanodon_brute", "weight": 400 } ] + }, { "type": "monstergroup", "name": "GROUP_zadrosaurus_UPGRADE", diff --git a/data/mods/DinoMod/monsters/dinosaur.json b/data/mods/DinoMod/monsters/dinosaur.json index 35a19e347e8c1..b2ad70918a887 100644 --- a/data/mods/DinoMod/monsters/dinosaur.json +++ b/data/mods/DinoMod/monsters/dinosaur.json @@ -2102,23 +2102,46 @@ }, { "type": "MONSTER", - "id": "mon_hadrosaurus", - "name": { "str_sp": "hadrosaurus" }, + "id": "mon_iguanodon", + "name": { "str": "iguanodon" }, "copy-from": "mon_camptosaurus", "volume": "1000 L", "weight": "1000 kg", "default_faction": "hadrosaur", + "//": "When large weights and volumes are fixed this should be 4500 L and 4500 kg", + "bodytype": "bear", + "stomach_size": 90000, + "speed": 130, + "attack_cost": 130, + "melee_dice": 2, + "melee_dice_sides": 6, + "melee_damage": [ { "damage_type": "cut", "amount": 4 } ], + "hp": 320, + "zombify_into": "mon_ziguanodon", + "fungalize_into": "mon_hadrosaurus_mutant1", + "description": "A bulky, beaked dinosaur with four strong legs. Spiked thumbs look like they could do some harm.", + "special_attacks": [ + { "type": "leap", "cooldown": 20, "max_range": 2, "allow_no_target": true }, + { "id": "stomp_DinoMod", "cooldown": 20, "damage_max_instance": [ { "damage_type": "bash", "amount": 8 } ] }, + [ "EAT_CROP", 40 ], + [ "BROWSE", 60 ] + ], + "reproduction": { "baby_egg": "egg_iguanodon", "baby_count": 30, "baby_timer": 60 }, + "armor": { "bash": 4, "cut": 4, "bullet": 3 } + }, + { + "type": "MONSTER", + "id": "mon_hadrosaurus", + "name": { "str_sp": "hadrosaurus" }, + "copy-from": "mon_iguanodon", "//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg", "bodytype": "bear", "stomach_size": 60000, "speed": 80, "attack_cost": 80, - "melee_dice": 2, - "melee_dice_sides": 6, "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], "hp": 250, "zombify_into": "mon_zadrosaurus", - "fungalize_into": "mon_hadrosaurus_mutant1", "description": "A bulky, beaked dinosaur with hooved front legs and strong clawed back legs.", "special_attacks": [ { "type": "leap", "cooldown": 10, "max_range": 2, "allow_no_target": true }, @@ -2126,8 +2149,7 @@ [ "EAT_CROP", 40 ], [ "BROWSE", 60 ] ], - "reproduction": { "baby_egg": "egg_hadrosaurus", "baby_count": 30, "baby_timer": 60 }, - "armor": { "bash": 4, "cut": 4, "bullet": 3 } + "reproduction": { "baby_egg": "egg_hadrosaurus", "baby_count": 30, "baby_timer": 60 } }, { "type": "MONSTER", diff --git a/data/mods/DinoMod/monsters/fungus.json b/data/mods/DinoMod/monsters/fungus.json index 1f2d52a5db8eb..890258921841f 100644 --- a/data/mods/DinoMod/monsters/fungus.json +++ b/data/mods/DinoMod/monsters/fungus.json @@ -903,6 +903,15 @@ "upgrades": false, "flags": [ "SEES", "SMELLS", "POISON", "STUMBLES", "NO_BREATHE", "FILTHY", "BASHES" ] }, + { + "id": "mon_ziguanodon_fungus", + "type": "MONSTER", + "name": { "str": "fungal iguanodon zombie" }, + "description": "Once a bulky, beaked four-legged dinosaur herbivore with spiky thumbs, fungal tendrils now sprout from its mouth, eyes, and other orifices, holding together a shambling mass of mold-covered flesh and bone.", + "copy-from": "mon_zamptosaurus_fungus", + "proportional": { "hp": 3.5 }, + "upgrades": false + }, { "id": "mon_zadrosaurus_fungus", "type": "MONSTER", diff --git a/data/mods/DinoMod/monsters/hatchling.json b/data/mods/DinoMod/monsters/hatchling.json index f1ab025338031..1ed560c2269fa 100644 --- a/data/mods/DinoMod/monsters/hatchling.json +++ b/data/mods/DinoMod/monsters/hatchling.json @@ -527,6 +527,13 @@ "name": "light green and yellow hatchling", "upgrades": { "age_grow": 20, "into": "mon_camptosaurus_juvenile" } }, + { + "id": "mon_iguanodon_hatchling", + "type": "MONSTER", + "copy-from": "mon_camptosaurus_hatchling", + "name": "dark gray and magenta hatchling", + "upgrades": { "age_grow": 30, "into": "mon_iguanodon_juvenile" } + }, { "id": "mon_hadrosaurus_hatchling", "type": "MONSTER", diff --git a/data/mods/DinoMod/monsters/juvenile.json b/data/mods/DinoMod/monsters/juvenile.json index bdff104befa0d..330bd458acc20 100644 --- a/data/mods/DinoMod/monsters/juvenile.json +++ b/data/mods/DinoMod/monsters/juvenile.json @@ -509,7 +509,7 @@ "id": "mon_stegosaurus_juvenile", "type": "MONSTER", "name": "green and magenta four-legged juvenile", - "description": "A small four-legged plant-eating dinosaur juvenile, it could be from a number of different species.", + "description": "A four-legged plant-eating dinosaur juvenile larger than a cow, it could be from a number of different species.", "copy-from": "mon_gallimimus_juvenile", "hp": 200, "volume": "1000 L", @@ -609,13 +609,19 @@ "extend": { "flags": [ "SWIMS", "CAN_BE_CULLED" ] } }, { - "id": "mon_hadrosaurus_juvenile", + "id": "mon_iguanodon_juvenile", "type": "MONSTER", "name": "gray and magenta two-legged juvenile", - "description": "A small two-legged plant-eating dinosaur juvenile, it could be from a number of different species.", "copy-from": "mon_camptosaurus_juvenile", + "description": "A two-legged plant-eating dinosaur juvenile larger than a cow, it could be from a number of different species.", "color": "yellow", "petfood": { "food": [ "DINOFOOD_C" ] }, + "upgrades": { "age_grow": 365, "into": "mon_iguanodon" } + }, + { + "id": "mon_hadrosaurus_juvenile", + "type": "MONSTER", + "copy-from": "mon_iguanodon_juvenile", "upgrades": { "age_grow": 365, "into": "mon_hadrosaurus" } }, { diff --git a/data/mods/DinoMod/monsters/zed-dinosaur.json b/data/mods/DinoMod/monsters/zed-dinosaur.json index 86cbd0a75246a..52f2f67218581 100644 --- a/data/mods/DinoMod/monsters/zed-dinosaur.json +++ b/data/mods/DinoMod/monsters/zed-dinosaur.json @@ -1224,21 +1224,21 @@ }, { "type": "MONSTER", - "id": "mon_zadrosaurus", - "name": { "str": "hadrosaurus zombie" }, + "id": "mon_ziguanodon", + "name": { "str": "iguanodon zombie" }, "copy-from": "mon_zamptosaurus", "looks_like": "mon_parasaurolophus", "volume": "1000 L", "weight": "1000 kg", "//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg", - "speed": 65, - "attack_cost": 65, + "speed": 100, + "attack_cost": 100, "melee_dice": 2, "melee_dice_sides": 6, - "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], + "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], "families": [ "prof_intro_biology", "prof_wp_zombie" ], "weakpoint_sets": [ "wps_dinosaur_body" ], - "hp": 300, + "hp": 330, "grab_strength": 50, "special_attacks": [ { "id": "bite_grab" }, @@ -1246,11 +1246,26 @@ { "type": "bite", "cooldown": 5 }, { "id": "stomp_DinoMod", "cooldown": 10, "damage_max_instance": [ { "damage_type": "bash", "amount": 12 } ] } ], + "description": "A bulky, beaked dinosaur with spiky thumbs, dead but walking, eyes vacant and swollen.", + "burn_into": "mon_ziguanodon_scorched", + "fungalize_into": "mon_ziguanodon_fungus", + "upgrades": { "half_life": 30, "into_group": "GROUP_ziguanodon_UPGRADE" }, + "armor": { "bash": 5, "cut": 7, "bullet": 4 } + }, + { + "type": "MONSTER", + "id": "mon_zadrosaurus", + "name": { "str": "hadrosaurus zombie" }, + "copy-from": "mon_ziguanodon", + "//": "When large weights and volumes are fixed this should be 3000 L and 3000 kg", + "speed": 65, + "attack_cost": 65, + "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], + "hp": 300, "description": "A bulky, beaked dinosaur, dead but walking, eyes vacant and swollen.", "burn_into": "mon_zadrosaurus_scorched", "fungalize_into": "mon_zadrosaurus_fungus", - "upgrades": { "half_life": 30, "into_group": "GROUP_zadrosaurus_UPGRADE" }, - "armor": { "bash": 5, "cut": 7, "bullet": 4 } + "upgrades": { "half_life": 30, "into_group": "GROUP_zadrosaurus_UPGRADE" } }, { "type": "MONSTER", diff --git a/data/mods/DinoMod/monsters/zinosaur_burned.json b/data/mods/DinoMod/monsters/zinosaur_burned.json index 3283276d592c7..d0d9b1147d062 100644 --- a/data/mods/DinoMod/monsters/zinosaur_burned.json +++ b/data/mods/DinoMod/monsters/zinosaur_burned.json @@ -923,21 +923,34 @@ }, { "type": "MONSTER", - "id": "mon_zadrosaurus_scorched", - "name": { "str": "scorched hadrosaurus zombie" }, + "id": "mon_ziguanodon_scorched", + "name": { "str": "scorched iguanodon zombie" }, "copy-from": "mon_zamptosaurus_scorched", - "looks_like": "mon_zadrosaurus", + "looks_like": "mon_ziguanodon", "volume": "1000 L", "weight": "1000 kg", - "speed": 55, - "attack_cost": 55, + "speed": 70, + "attack_cost": 70, "melee_dice": 2, "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "cut", "amount": 2 } ], + "hp": 150, + "fungalize_into": "mon_ziguanodon_fungus", + "description": "A heavily-burned bulky zombie dinosaur with a beak and sharp pointed thumbs; it still reeks of charred meat. Its flesh has mended into a leathery shell.", + "armor": { "bash": 7, "acid": 3, "heat": 15, "cut": 16, "bullet": 11 } + }, + { + "type": "MONSTER", + "id": "mon_zadrosaurus_scorched", + "name": { "str": "scorched hadrosaurus zombie" }, + "copy-from": "mon_ziguanodon_scorched", + "looks_like": "mon_zadrosaurus", + "speed": 55, + "attack_cost": 55, "melee_damage": [ { "damage_type": "bash", "amount": 2 } ], "hp": 110, "fungalize_into": "mon_zadrosaurus_fungus", - "description": "A heavily-burned bulky zombie dinosaur with a beak; it still reeks of charred meat. Its flesh has mended into a leathery shell.", - "armor": { "bash": 7, "acid": 3, "heat": 15, "cut": 16, "bullet": 11 } + "description": "A heavily-burned bulky zombie dinosaur with a beak; it still reeks of charred meat. Its flesh has mended into a leathery shell." }, { "type": "MONSTER", diff --git a/data/mods/DinoMod/monsters/zinosaur_upgrade.json b/data/mods/DinoMod/monsters/zinosaur_upgrade.json index 8191a53f4e092..51eb435688af6 100644 --- a/data/mods/DinoMod/monsters/zinosaur_upgrade.json +++ b/data/mods/DinoMod/monsters/zinosaur_upgrade.json @@ -1135,6 +1135,28 @@ "extend": { "flags": [ "GROUP_BASH", "PUSH_MON", "PUSH_VEH" ] }, "categories": [ "DINOSAUR" ] }, + { + "type": "MONSTER", + "id": "mon_ziguanodon_brute", + "name": { "str": "Inevitable Iguanodon" }, + "copy-from": "mon_ziguanodon", + "description": "A bulky, four-legged dinosaur with a beak and spiked thumbs, dead but walking, eyes vacant and swollen. Its entire body bulges with distended muscles and swollen, festering wounds.", + "diff": 2, + "color": "red", + "proportional": { "hp": 1.5, "speed": 1.5 }, + "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_zadrosaurus_brute", @@ -3949,6 +3971,30 @@ "categories": [ "DINOSAUR" ], "armor": { "cut": 4, "bullet": 2, "bash": 0 } }, + { + "type": "MONSTER", + "id": "mon_siguanodon", + "name": { "str": "armored iguanodon" }, + "copy-from": "mon_ziguanodon", + "color": "white", + "material": [ "bone" ], + "description": "This bulky, four-legged dinosaur corpse with a beak and spiked thumbs has grown dense bone armor.", + "proportional": { "hp": 0.4, "speed": 0.875 }, + "relative": { + "melee_dice": 9, + "melee_dice_sides": 5, + "melee_damage": [ { "damage_type": "bash", "amount": 7 } ], + "vision_day": -20, + "armor": { "cut": 22, "stab": 30, "acid": 3, "bullet": 30 } + }, + "bleed_rate": 50, + "families": [ "prof_intro_biology", "prof_wp_zombie", "prof_wp_skeleton" ], + "upgrades": false, + "extend": { "flags": [ "HARDTOSHOOT" ] }, + "harvest": "mr_bones", + "categories": [ "DINOSAUR" ], + "armor": { "cut": 7, "bullet": 4, "bash": 0 } + }, { "type": "MONSTER", "id": "mon_sadrosaurus", diff --git a/data/mods/DinoMod/requirements/cooking_components.json b/data/mods/DinoMod/requirements/cooking_components.json index 8a1fe6471ecdb..5ead158529539 100644 --- a/data/mods/DinoMod/requirements/cooking_components.json +++ b/data/mods/DinoMod/requirements/cooking_components.json @@ -50,6 +50,7 @@ [ "egg_scolosaurus", 1 ], [ "egg_tenontosaurus", 1 ], [ "egg_camptosaurus", 1 ], + [ "egg_iguanodon", 1 ], [ "egg_hadrosaurus", 1 ], [ "egg_maiasaura", 1 ], [ "egg_gryposaurus", 1 ],