Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DinoMod] Mosasaurus #42855

Merged
merged 7 commits into from
Aug 11, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion data/mods/DinoMod/cooking_components.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@
[ "egg_dimorphodon", 1 ],
[ "egg_pteranodon", 1 ],
[ "egg_dilophosaurus", 1 ],
[ "egg_ceratosaurus", 1 ]
[ "egg_ceratosaurus", 1 ],
[ "egg_mosasaurus", 1 ]
]
]
}
Expand Down
7 changes: 7 additions & 0 deletions data/mods/DinoMod/egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -195,5 +195,12 @@
"name": "ceratosaurus egg",
"copy-from": "egg_dino",
"rot_spawn": "GROUP_EGG_ceratosaurus"
},
{
"type": "COMESTIBLE",
"id": "egg_mosasaurus",
"name": "mosasaurus egg",
"copy-from": "egg_dino",
"rot_spawn": "GROUP_EGG_mosasaurus"
}
]
9 changes: 8 additions & 1 deletion data/mods/DinoMod/monstergroups/monstergroups_egg.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
{ "monster": "mon_dimorphodon_hatchling", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_pteranodon_hatchling", "freq": 50, "cost_multiplier": 1 },
{ "monster": "mon_dilophosaurus_hatchling", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_ceratosaurus_hatchling", "freq": 1, "cost_multiplier": 1 }
{ "monster": "mon_ceratosaurus_hatchling", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_mosasaurus_hatchling", "freq": 5, "cost_multiplier": 1 }
]
},
{
Expand Down Expand Up @@ -180,5 +181,11 @@
"type": "monstergroup",
"default": "mon_ceratosaurus_hatchling",
"monsters": [ { "monster": "mon_ceratosaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
},
{
"name": "GROUP_EGG_mosasaurus",
"type": "monstergroup",
"default": "mon_mosasaurus_hatchling",
"monsters": [ { "monster": "mon_mosasaurus_hatchling", "freq": 100, "cost_multiplier": 1 } ]
}
]
7 changes: 6 additions & 1 deletion data/mods/DinoMod/monstergroups/wilderness.json
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,12 @@
{ "monster": "mon_zeratosaurus", "freq": 1, "cost_multiplier": 35, "starts": 72 },
{ "monster": "mon_zeratosaurus", "freq": 1, "cost_multiplier": 35, "starts": 168 },
{ "monster": "mon_zeratosaurus", "freq": 1, "cost_multiplier": 35, "starts": 672 },
{ "monster": "mon_zeratosaurus", "freq": 1, "cost_multiplier": 35, "starts": 2160 }
{ "monster": "mon_zeratosaurus", "freq": 1, "cost_multiplier": 35, "starts": 2160 },
{ "monster": "mon_mosasaurus", "freq": 4, "cost_multiplier": 60 },
{ "monster": "mon_zosasaurus", "freq": 1, "cost_multiplier": 100, "starts": 72 },
{ "monster": "mon_zosasaurus", "freq": 1, "cost_multiplier": 100, "starts": 168 },
{ "monster": "mon_zosasaurus", "freq": 1, "cost_multiplier": 100, "starts": 672 },
{ "monster": "mon_zosasaurus", "freq": 1, "cost_multiplier": 100, "starts": 2160 }
]
},
{
Expand Down
42 changes: 42 additions & 0 deletions data/mods/DinoMod/monsters/dinosaur.json
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,41 @@
"placate_triggers": [ "MEAT" ],
"categories": [ "DINOSAUR" ]
},
{
"type": "MONSTER",
"id": "mon_mosasaurus",
"name": { "str_sp": "Mosasaurus" },
"species": "DINOSAUR",
"default_faction": "mosasaurus",
"symbol": "D",
"color": "red_white",
"volume": "1000 L",
"weight": "13000 kg",
"bodytype": "fish",
"material": [ "flesh" ],
"aggression": 100,
"morale": 100,
"speed": 30,
"melee_skill": 10,
"melee_dice": 3,
"melee_dice_sides": 8,
"melee_cut": 16,
"armor_bash": 4,
"armor_cut": 4,
"armor_bullet": 6,
"hp": 350,
"death_function": [ "NORMAL" ],
"zombify_into": "mon_zosasaurus",
"description": "A huge aquatic dinosaur about the size of a small house, with a ferocious crocodile-like head and powerful swimming fins.",
"reproduction": { "baby_egg": "egg_mosasaurus", "baby_count": 3, "baby_timer": 24 },
"baby_flags": [ "SPRING", "SUMMER" ],
"biosignature": { "biosig_item": "feces_bird", "biosig_timer": 3 },
"flags": [ "SEES", "HEARS", "ANIMAL", "PATH_AVOID_DANGER_1", "DESTROYS", "WARM", "SWIMS", "AQUATIC" ],
"harvest": "dino_large_pred",
"anger_triggers": [ "STALK", "PLAYER_WEAK", "HURT" ],
"placate_triggers": [ "MEAT" ],
"categories": [ "DINOSAUR" ]
},
{
"id": "mon_compsognathus_hatchling",
"type": "MONSTER",
Expand Down Expand Up @@ -1055,5 +1090,12 @@
"copy-from": "mon_compsognathus_hatchling",
"name": "brown and white hatchling",
"upgrades": { "age_grow": 30, "into": "mon_ceratosaurus" }
},
{
"id": "mon_mosasaurus_hatchling",
"type": "MONSTER",
"copy-from": "mon_compsognathus_hatchling",
"name": "red and white hatchling",
"upgrades": { "age_grow": 20, "into": "mon_mosasaurus" }
}
]
47 changes: 34 additions & 13 deletions data/mods/DinoMod/monsters/zed-dinosaur.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "MONSTER",
"id": "mon_zallimimus",
"name": { "str_sp": "Gallimimus zombie" },
"name": { "str": "Gallimimus zombie" },
"looks_like": "mon_gallimimus",
"species": [ "ZOMBIE" ],
"default_faction": "zombie",
Expand Down Expand Up @@ -35,7 +35,7 @@
{
"type": "MONSTER",
"id": "mon_zachycephalosaurus",
"name": { "str_sp": "Pachy zombie" },
"name": { "str": "Pachy zombie" },
"looks_like": "mon_pachycephalosaurus",
"species": [ "ZOMBIE" ],
"default_faction": "zombie",
Expand Down Expand Up @@ -157,7 +157,7 @@
{
"type": "MONSTER",
"id": "mon_zalbertosaurus",
"name": { "str_sp": "Albertosaurus zombie" },
"name": { "str": "Albertosaurus zombie" },
"copy-from": "mon_zyrannosaurus",
"weight": "2500 kg",
"melee_dice_sides": 4,
Expand All @@ -173,7 +173,7 @@
{
"type": "MONSTER",
"id": "mon_zriceratops",
"name": { "str_sp": "Triceraterror" },
"name": { "str": "Triceraterror" },
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_triceratops",
"volume": "1000 L",
Expand All @@ -194,7 +194,7 @@
{
"type": "MONSTER",
"id": "mon_ztegosaurus",
"name": { "str_sp": "Stegosaurus zombie" },
"name": { "str": "Stegosaurus zombie" },
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_stegosaurus",
"volume": "1000 L",
Expand All @@ -215,7 +215,7 @@
{
"type": "MONSTER",
"id": "mon_zankylosaurus",
"name": { "str_sp": "Ankylosaurus zombie" },
"name": { "str": "Ankylosaurus zombie" },
"looks_like": "mon_ankylosaurus",
"species": [ "ZOMBIE" ],
"default_faction": "zombie",
Expand Down Expand Up @@ -272,7 +272,7 @@
{
"type": "MONSTER",
"id": "mon_zamarasaurus",
"name": { "str_sp": "Camarasaurus zombie" },
"name": { "str": "Camarasaurus zombie" },
"copy-from": "mon_zapatosaurus",
"looks_like": "mon_apatosaurus",
"speed": 50,
Expand All @@ -282,7 +282,7 @@
{
"type": "MONSTER",
"id": "mon_zapatosaurus",
"name": { "str_sp": "Apatosaurus zombie" },
"name": { "str": "Apatosaurus zombie" },
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_apatosaurus",
"volume": "1000 L",
Expand All @@ -306,7 +306,7 @@
{
"type": "MONSTER",
"id": "mon_zallosaurus",
"name": { "str_sp": "Allosaurus zombie" },
"name": { "str": "Allosaurus zombie" },
"copy-from": "mon_zyrannosaurus",
"looks_like": "mon_allosaurus",
"volume": "1000 L",
Expand Down Expand Up @@ -418,7 +418,7 @@
{
"type": "MONSTER",
"id": "mon_zarasaurolophus",
"name": { "str_sp": "Parasaurolophus zombie" },
"name": { "str": "Parasaurolophus zombie" },
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_parasaurolophus",
"volume": "1000 L",
Expand Down Expand Up @@ -479,7 +479,7 @@
{
"type": "MONSTER",
"id": "mon_zteranodon",
"name": { "str_sp": "Pteranodon zombie" },
"name": { "str": "Pteranodon zombie" },
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_pteranodon",
"volume": "38 L",
Expand All @@ -501,7 +501,7 @@
{
"type": "MONSTER",
"id": "mon_zilophosaurus",
"name": { "str_sp": "Dilophosaurus zombie" },
"name": { "str": "Dilophosaurus zombie" },
"copy-from": "mon_zallimimus",
"looks_like": "mon_dilophosaurus",
"volume": "400 L",
Expand All @@ -521,7 +521,7 @@
{
"type": "MONSTER",
"id": "mon_zeratosaurus",
"name": { "str_sp": "Zombie dragon" },
"name": { "str": "Zombie dragon" },
"copy-from": "mon_zyrannosaurus",
"looks_like": "mon_zyrannosaurus",
"volume": "540 L",
Expand All @@ -538,5 +538,26 @@
"description": "This zombie is enormous, scaly, studded with bony spikes, and it moves with horrible speed. Its colorful horns are worn and wet with filth and its bright scales and bone spikes have taken a beating.",
"upgrades": { "half_life": 14, "into_group": "GROUP_zeratosaurus_UPGRADE" },
"flags": [ "SEES", "SMELLS", "HEARS", "BASHES", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY", "WARM", "SWIMS" ]
},
{
"type": "MONSTER",
"id": "mon_zosasaurus",
"name": { "str": "Mosasaurus zombie" },
"copy-from": "mon_zyrannosaurus",
"looks_like": "mon_zyrannosaurus",
"volume": "1000 L",
"weight": "13000 kg",
"bodytype": "fish",
"speed": 24,
"melee_skill": 10,
"melee_dice": 3,
"melee_dice_sides": 8,
"melee_cut": 16,
"armor_bash": 5,
"armor_cut": 7,
"armor_bullet": 7,
"hp": 580,
"description": "The ragged bloated corpse of a huge aquatic dinosaur the size of a house, with a crocodile-like head and swimming fins.",
"flags": [ "SEES", "HEARS", "DESTROYS", "WARM", "SWIMS", "AQUATIC", "POISON", "STUMBLES", "NO_BREATHE", "REVIVES", "FILTHY" ]
}
]