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.

Sign up for GitHub

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

goat #55870

Merged
merged 5 commits into from
Mar 8, 2022
Merged

goat #55870

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b1018c
goat
LyleSY Mar 6, 2022
453a586
spawn safe goats
LyleSY Mar 6, 2022
abf7dbe
fix looks-like
LyleSY Mar 6, 2022
a0ff3df
Update data/json/monsters/mammal.json
LyleSY Mar 6, 2022
8e3373e
goats
LyleSY Mar 6, 2022
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
2 changes: 2 additions & 0 deletions data/json/monstergroups/misc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@
{ "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "28 days", "pack_size": [ 1, 6 ] },
{ "monster": "mon_pig", "weight": 10, "cost_multiplier": 25, "ends": "90 days", "pack_size": [ 1, 6 ] },
{ "monster": "mon_sheep", "weight": 50, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
{ "monster": "mon_goat", "weight": 25, "cost_multiplier": 25, "pack_size": [ 1, 12 ] },
{ "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "3 days", "pack_size": [ 1, 5 ] },
{ "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "7 days", "pack_size": [ 1, 5 ] },
{ "monster": "mon_zombie_pig", "weight": 10, "cost_multiplier": 25, "starts": "28 days", "pack_size": [ 1, 5 ] },
Expand Down Expand Up @@ -277,6 +278,7 @@
{ "monster": "mon_horse", "weight": 10 },
{ "monster": "mon_pig", "weight": 10 },
{ "monster": "mon_sheep", "weight": 10 },
{ "monster": "mon_goat", "weight": 10 },
{ "monster": "mon_lemming", "weight": 10 }
]
},
Expand Down
35 changes: 34 additions & 1 deletion data/json/monsters/mammal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,7 +2314,7 @@
"id": "mon_sheep_lamb",
"type": "MONSTER",
"name": { "str": "lamb" },
"description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated. Its body is covered in a thick layer of wool, and the males have long, spiraling horns.",
"description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated. Its body is covered in a thick layer of wool.",
"default_faction": "herbivore",
"bodytype": "dog",
"categories": [ "WILDLIFE" ],
Expand Down Expand Up @@ -2376,6 +2376,39 @@
"petfood": { "food": [ "CATTLEFOOD" ], "feed": "The %s seems to like you! It lets you pat its head and seems friendly." },
"flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE" ]
},
{
"id": "mon_goat_kid",
"type": "MONSTER",
"name": { "str": "kid" },
LyleSY marked this conversation as resolved.
Show resolved Hide resolved
"copy-from": "mon_sheep_lamb",
"description": "A hooved browsing mammal known for climbing and eating just about anything. The young are famously cute and cuddly.",
"symbol": "g",
"looks_like": "mon_goat",
"dodge": 3,
"upgrades": { "age_grow": 240, "into": "mon_goat" },
"//": "Puberty reached in 6-9 months."
},
{
"id": "mon_goat",
"type": "MONSTER",
"name": { "str_sp": "goat" },
LyleSY marked this conversation as resolved.
Show resolved Hide resolved
"copy-from": "mon_sheep",
"description": "A hooved browsing mammal known for climbing and eating just about anything. Either gender can have horns.",
"volume": "75 L",
"weight": "75 kg",
"hp": 80,
"speed": 200,
"symbol": "g",
"color": "white",
"dodge": 3,
"shearing": [ { "result": "wool_staple", "amount": 5 } ],
"harvest": "mammal_large_wool",
"reproduction": { "baby_monster": "mon_goat_kid", "baby_count": 1, "baby_timer": 275 },
"//": "Timer copied from sheep",
"baby_flags": [ "SPRING" ],
"special_attacks": [ [ "EAT_CROP", 100 ] ],
"flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "PATH_AVOID_DANGER_1", "WARM", "PET_WONT_FOLLOW", "MILKABLE", "CLIMBS" ]
},
{
"id": "mon_squirrel",
"type": "MONSTER",
Expand Down