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] cap dinos at 1000 kg #44514

Merged
merged 2 commits into from
Sep 30, 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
33 changes: 14 additions & 19 deletions data/mods/DinoMod/monsters/dinosaur.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"type": "SPECIES",
"id": "DINOSAUR",
"//": "Capping these at 1000 L to prevent bodies disappearing",
"//": "Capping these at 1000 L and kg to prevent bodies and meat disappearing",
"fear_triggers": [ "FIRE" ]
},
{
Expand Down Expand Up @@ -160,7 +160,7 @@
"symbol": "D",
"color": "red_white",
"volume": "1000 L",
"weight": "16000 kg",
"weight": "1000 kg",
"bodytype": "bear",
"material": [ "flesh" ],
"aggression": 100,
Expand Down Expand Up @@ -196,7 +196,7 @@
"symbol": "D",
"color": "light_red_white",
"volume": "1000 L",
"weight": "5500 kg",
"weight": "1000 kg",
"bodytype": "ostrich",
"material": [ "flesh" ],
"aggression": 100,
Expand Down Expand Up @@ -233,7 +233,7 @@
"looks_like": "mon_tyrannosaurus",
"color": "light_red_white",
"volume": "1000 L",
"weight": "2500 kg",
"weight": "1000 kg",
"bodytype": "ostrich",
"material": [ "flesh" ],
"aggression": 90,
Expand Down Expand Up @@ -265,7 +265,7 @@
"id": "mon_pachyrhinosaurus",
"name": { "str_sp": "Pachyrhinosaurus" },
"copy-from": "mon_triceratops",
"weight": "4000 kg",
"weight": "1000 kg",
"melee_skill": 8,
"hp": 400,
"zombify_into": "mon_zachyrhinosaurus",
Expand All @@ -283,7 +283,7 @@
"id": "mon_pentaceratops",
"name": { "str_sp": "Pentaceratops" },
"copy-from": "mon_triceratops",
"weight": "5000 kg",
"weight": "1000 kg",
"melee_skill": 8,
"armor_cut": 8,
"armor_bash": 6,
Expand All @@ -297,7 +297,7 @@
"id": "mon_torosaurus",
"name": { "str_sp": "Torosaurus" },
"copy-from": "mon_triceratops",
"weight": "5000 kg",
"weight": "1000 kg",
"melee_skill": 8,
"armor_cut": 6,
"armor_bash": 6,
Expand All @@ -316,7 +316,7 @@
"symbol": "D",
"color": "light_green_magenta",
"volume": "1000 L",
"weight": "6000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"material": [ "flesh" ],
"diff": 30,
Expand Down Expand Up @@ -384,7 +384,7 @@
"symbol": "D",
"color": "green_magenta",
"volume": "1000 L",
"weight": "3000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"material": [ "flesh" ],
"aggression": -20,
Expand Down Expand Up @@ -424,7 +424,7 @@
"symbol": "D",
"color": "brown_magenta",
"volume": "1000 L",
"weight": "6000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"material": [ "flesh" ],
"aggression": -20,
Expand Down Expand Up @@ -460,7 +460,6 @@
"id": "mon_diplodocus",
"name": { "str_sp": "Diplodocus" },
"copy-from": "mon_apatosaurus",
"weight": "14000 kg",
"morale": 90,
"hp": 280,
"speed": 60,
Expand Down Expand Up @@ -491,7 +490,7 @@
"symbol": "D",
"color": "brown_magenta",
"volume": "1000 L",
"weight": "20000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"material": [ "flesh" ],
"aggression": -10,
Expand Down Expand Up @@ -565,7 +564,6 @@
"name": { "str_sp": "Acrocanthosaurus" },
"copy-from": "mon_allosaurus",
"default_faction": "acrocanthosaurus",
"weight": "6000 kg",
"speed": 75,
"melee_cut": 8,
"armor_bash": 10,
Expand All @@ -582,7 +580,6 @@
"name": { "str_sp": "Siats" },
"copy-from": "mon_allosaurus",
"default_faction": "siats",
"weight": "5000 kg",
"speed": 75,
"hp": 800,
"zombify_into": "mon_ziats",
Expand Down Expand Up @@ -770,7 +767,6 @@
"id": "mon_maiasaura",
"name": { "str_sp": "Maiasaura" },
"copy-from": "mon_parasaurolophus",
"weight": "2500 kg",
"hp": 250,
"zombify_into": "mon_zaiasaura",
"description": "A huge scaly dinosaur with hooves and heavy tail. Has a flat beak, thick nose, and small spiky head crest.",
Expand All @@ -785,7 +781,7 @@
"symbol": "D",
"color": "dark_gray_magenta",
"volume": "1000 L",
"weight": "3500 kg",
"weight": "1000 kg",
"bodytype": "bear",
"material": [ "flesh" ],
"aggression": -40,
Expand Down Expand Up @@ -815,7 +811,6 @@
"id": "mon_corythosaurus",
"name": { "str_sp": "Corythosaurus" },
"copy-from": "mon_parasaurolophus",
"weight": "3800 kg",
"speed": 120,
"armor_cut": 6,
"hp": 300,
Expand All @@ -829,7 +824,6 @@
"id": "mon_edmontosaurus",
"name": { "str_sp": "Edmontosaurus" },
"copy-from": "mon_parasaurolophus",
"weight": "4000 kg",
"hp": 340,
"speed": 110,
"armor_cut": 6,
Expand Down Expand Up @@ -974,6 +968,7 @@
"name": { "str_sp": "Coelophysis" },
"copy-from": "mon_eoraptor",
"default_faction": "coelophysis",
"volume": "20 L",
"weight": "20 kg",
"aggression": 20,
"morale": 40,
Expand Down Expand Up @@ -1087,7 +1082,7 @@
"symbol": "D",
"color": "red_white",
"volume": "1000 L",
"weight": "13000 kg",
"weight": "1000 kg",
"bodytype": "fish",
"material": [ "flesh" ],
"aggression": 60,
Expand Down
31 changes: 13 additions & 18 deletions data/mods/DinoMod/monsters/zed-dinosaur.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"symbol": "Z",
"color": "green",
"volume": "1000 L",
"weight": "16000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"material": [ "flesh" ],
"aggression": 100,
Expand Down Expand Up @@ -119,7 +119,7 @@
"symbol": "Z",
"color": "green",
"volume": "1000 L",
"weight": "5000 kg",
"weight": "1000 kg",
"bodytype": "ostrich",
"material": [ "flesh" ],
"aggression": 100,
Expand Down Expand Up @@ -160,7 +160,6 @@
"id": "mon_zalbertosaurus",
"name": { "str": "Albertosaurus zombie" },
"copy-from": "mon_zyrannosaurus",
"weight": "2500 kg",
"melee_dice_sides": 4,
"melee_cut": 10,
"armor_bash": 5,
Expand All @@ -176,7 +175,6 @@
"id": "mon_zachyrhinosaurus",
"name": { "str": "Pachyrhinosaurus zombie" },
"copy-from": "mon_zriceratops",
"weight": "4000 kg",
"hp": 400,
"description": "A massive shambling rhino-like dinosaur corpse with a tall bony crest from which four long horns and a short nose horn emerge. Its black eyes ooze like tears.",
"special_attacks": [
Expand All @@ -189,7 +187,6 @@
"id": "mon_zentaceratops",
"name": { "str": "Pentaceraterror" },
"copy-from": "mon_zriceratops",
"weight": "5000 kg",
"armor_cut": 9,
"armor_bash": 8,
"hp": 500,
Expand All @@ -200,7 +197,6 @@
"id": "mon_zorosaurus",
"name": { "str": "Torosaurus zombie" },
"copy-from": "mon_zriceratops",
"weight": "5000 kg",
"armor_cut": 9,
"armor_bash": 8,
"hp": 500,
Expand All @@ -214,7 +210,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_triceratops",
"volume": "1000 L",
"weight": "6000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"speed": 65,
"melee_skill": 10,
Expand All @@ -236,7 +232,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_stegosaurus",
"volume": "1000 L",
"weight": "3000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"speed": 15,
"melee_skill": 7,
Expand All @@ -260,7 +256,7 @@
"symbol": "Z",
"color": "green",
"volume": "1000 L",
"weight": "6000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"material": [ "flesh" ],
"aggression": 100,
Expand Down Expand Up @@ -290,7 +286,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_apatosaurus",
"volume": "1000 L",
"weight": "14000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"speed": 50,
"melee_skill": 7,
Expand Down Expand Up @@ -324,7 +320,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_apatosaurus",
"volume": "1000 L",
"weight": "20000 kg",
"weight": "1000 kg",
"bodytype": "elephant",
"speed": 65,
"melee_skill": 7,
Expand Down Expand Up @@ -370,7 +366,7 @@
"copy-from": "mon_zyrannosaurus",
"looks_like": "mon_allosaurus",
"volume": "1000 L",
"weight": "6000 kg",
"weight": "1000 kg",
"speed": 60,
"melee_skill": 9,
"melee_dice": 3,
Expand All @@ -391,7 +387,7 @@
"copy-from": "mon_zyrannosaurus",
"looks_like": "mon_allosaurus",
"volume": "1000 L",
"weight": "5000 kg",
"weight": "1000 kg",
"speed": 60,
"melee_skill": 9,
"melee_dice": 3,
Expand Down Expand Up @@ -501,7 +497,6 @@
"id": "mon_zaiasaura",
"name": { "str": "Maiasaura zombie" },
"copy-from": "mon_zarasaurolophus",
"weight": "2500 kg",
"hp": 400,
"description": "A huge mottled dinosaur with hooves and heavy tail, dead and walking, eyes vacant and swollen. Has a flat beak, thick nose, and small spiky head crest.",
"upgrades": { "half_life": 14, "into": "mon_zaiasaura_brute" }
Expand All @@ -513,7 +508,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_parasaurolophus",
"volume": "1000 L",
"weight": "3500 kg",
"weight": "1000 kg",
"speed": 80,
"melee_skill": 8,
"melee_dice": 2,
Expand All @@ -533,7 +528,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_parasaurolophus",
"volume": "1000 L",
"weight": "3800 kg",
"weight": "1000 kg",
"speed": 95,
"melee_skill": 8,
"melee_dice": 2,
Expand All @@ -554,7 +549,7 @@
"copy-from": "mon_zamptosaurus",
"looks_like": "mon_parasaurolophus",
"volume": "1000 L",
"weight": "4000 kg",
"weight": "1000 kg",
"speed": 90,
"melee_skill": 8,
"melee_dice": 2,
Expand Down Expand Up @@ -658,7 +653,7 @@
"copy-from": "mon_zyrannosaurus",
"looks_like": "mon_zyrannosaurus",
"volume": "1000 L",
"weight": "13000 kg",
"weight": "1000 kg",
"bodytype": "fish",
"speed": 24,
"melee_skill": 10,
Expand Down