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

Add more cats and kittens #38889

Merged
merged 11 commits into from
Apr 4, 2020
Merged

Add more cats and kittens #38889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
bf8a507
Stub in some cat ideas
wapcaplet Mar 15, 2020
53986af
Merge branch 'master' into more-cats
wapcaplet Mar 19, 2020
21fb1ea
Add cat descriptions
wapcaplet Mar 19, 2020
8fe32b2
Add type to cats
wapcaplet Mar 19, 2020
95ec5ba
Merge branch 'master' into more-cats
wapcaplet Mar 31, 2020
a52bd49
Add golden chonker and some volumes/weights
wapcaplet Mar 31, 2020
bc3c7cb
Add kittens with descriptions
wapcaplet Apr 4, 2020
de25a58
Add cats to animal shelter
wapcaplet Apr 4, 2020
51adf78
Add new cats to animal pound, shelter, and groups
wapcaplet Apr 4, 2020
9717819
Merge branch 'master' into more-cats
wapcaplet Apr 4, 2020
41535f9
Let the cats have kittens
wapcaplet Apr 4, 2020
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
9 changes: 8 additions & 1 deletion data/json/mapgen/animalpound.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@
"name": "GROUP_ANIMALPOUND_CATS",
"type": "monstergroup",
"default": "mon_null",
"monsters": [ { "monster": "mon_cat", "freq": 300, "cost_multiplier": 0 } ]
"monsters": [
{ "monster": "mon_cat", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_cat_tabby", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_cat_longhair", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_cat_siamese", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_cat_persian", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_cat_chonker", "freq": 20, "cost_multiplier": 0 }
]
},
{
"name": "GROUP_ANIMALPOUND_DOGS",
Expand Down
25 changes: 24 additions & 1 deletion data/json/mapgen/animalshelter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,30 @@
"name": "GROUP_ANIMALSHELTER_CATS",
"type": "monstergroup",
"default": "mon_null",
"monsters": [ { "monster": "mon_cat", "freq": 250, "cost_multiplier": 0 } ]
"monsters": [
{ "monster": "mon_cat", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_cat_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_tabby", "freq": 100, "cost_multiplier": 0 },
{ "monster": "mon_cat_tabby_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_longhair", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_cat_longhair_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_siamese", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_cat_siamese_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_persian", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_cat_persian_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_calico", "freq": 50, "cost_multiplier": 0 },
{ "monster": "mon_cat_calico_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_maine_coon", "freq": 20, "cost_multiplier": 0 },
{ "monster": "mon_cat_maine_coon_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_bengal", "freq": 20, "cost_multiplier": 0 },
{ "monster": "mon_cat_bengal_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_devon_rex", "freq": 10, "cost_multiplier": 0 },
{ "monster": "mon_cat_devon_rex_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_sphynx", "freq": 10, "cost_multiplier": 0 },
{ "monster": "mon_cat_sphynx_kitten", "freq": 5, "cost_multiplier": 0 },
{ "monster": "mon_cat_chonker", "freq": 10, "cost_multiplier": 0 },
{ "monster": "mon_cat_chonker_kitten", "freq": 5, "cost_multiplier": 0 }
]
},
{
"name": "GROUP_ANIMALSHELTER_DOGS",
Expand Down
11 changes: 10 additions & 1 deletion data/json/monstergroups/misc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,21 @@
"monsters": [
{ "monster": "mon_bat", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_bobcat", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_cat", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_chicken", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_chipmunk", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_crow", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_deer", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_duck", "freq": 10, "cost_multiplier": 1 },
{ "monster": "mon_cat", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_tabby", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_longhair", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_siamese", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_persian", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_calico", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_maine_coon", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_devon_rex", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_sphynx", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_cat_chonker", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_dog", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_dog_bull", "freq": 1, "cost_multiplier": 1 },
{ "monster": "mon_dog_auscattle", "freq": 1, "cost_multiplier": 1 },
Expand Down
174 changes: 172 additions & 2 deletions data/json/monsters/mammal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@
"id": "mon_cat_kitten",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": { "str": "kitten" },
"name": { "str": "shorthair kitten" },
"description": "A cuddly kitten meowing and scampering amidst the death. Currently feral.",
"default_faction": "cat",
"bodytype": "dog",
Expand All @@ -281,7 +281,7 @@
{
"id": "mon_cat",
"type": "MONSTER",
"name": { "str": "cat" },
"name": { "str": "shorthair cat" },
"description": "A small domesticated predator gone feral in the absence of human stewardship. Harried by the elements and the rigors of survival, it is scruffy and skittish.",
"default_faction": "cat",
"bodytype": "dog",
Expand Down Expand Up @@ -310,6 +310,176 @@
"reproduction": { "baby_monster": "mon_cat_kitten", "baby_count": 4, "baby_timer": 60 },
"flags": [ "SEES", "HEARS", "GOODHEARING", "SMELLS", "ANIMAL", "CATFOOD", "PATH_AVOID_DANGER_1", "WARM", "HIT_AND_RUN" ]
},
{
"id": "mon_cat_longhair",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "longhair cat",
"description": "This cat's long fur appears difficult to groom, but the cat seems to manage it despite the environmental conditions.",
"volume": "6000 ml",
"weight": "6 kg",
"reproduction": { "baby_monster": "mon_cat_longhair_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_longhair_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "longhair kitten",
"description": "Barely more than a ball of fluff with eyes, this kitten looks like a longhair breed.",
"upgrades": { "age_grow": 120, "into": "mon_cat_longhair" }
},
{
"id": "mon_cat_maine_coon",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "Maine coon cat",
"description": "Impressively large for a domestic cat, this thick-haired breed was once native to the state of Maine.",
"volume": "8000 ml",
"weight": "9 kg",
"hp": 16,
"reproduction": { "baby_monster": "mon_cat_maine_coon_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_maine_coon_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "Maine coon kitten",
"description": "This young Maine coon has tufted ears and a striking pattern on its face.",
"upgrades": { "age_grow": 120, "into": "mon_cat_maine_coon" }
},
{
"id": "mon_cat_siamese",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "Siamese cat",
"description": "This cat has the distinctive dark extremeties of a Siamese, first native to Asia but a common domestic breed in North America.",
"reproduction": { "baby_monster": "mon_cat_siamese_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_siamese_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "Siamese kitten",
"description": "With cream-colored fur and dark points, you guess this kitten must be a young Siamese.",
"upgrades": { "age_grow": 120, "into": "mon_cat_siamese" }
},
{
"id": "mon_cat_persian",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "Persian cat",
"description": "The short nose and rounded face of this cat suggest it comes from the popular Persian breed.",
"reproduction": { "baby_monster": "mon_cat_persian_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_persian_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "Persian kitten",
"description": "An adorably squashed nose and sad pleading eyes beg you to adopt this tiny Persian.",
"upgrades": { "age_grow": 120, "into": "mon_cat_persian" }
},
{
"id": "mon_cat_bengal",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "Bengal cat",
"description": "Looking like a spotted wild cat, the Bengal breed derives from the Asian leopard cat and Egyptian Mau.",
"volume": "5000 ml",
"weight": "5 kg",
"reproduction": { "baby_monster": "mon_cat_bengal_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_bengal_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "Bengal kitten",
"description": "You have seen spots like this on Bengal cats, but this one is just a kitten.",
"upgrades": { "age_grow": 120, "into": "mon_cat_bengal" }
},
{
"id": "mon_cat_devon_rex",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "Devon Rex cat",
"description": "An unusual-looking cat with strikingly large eyes and ears, sporting a soft curly coat of fur.",
"reproduction": { "baby_monster": "mon_cat_devon_rex_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_devon_rex_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "Devon Rex kitten",
"description": "This curly-coated kitten has enormous ears and inquisitive eyes, possibly a Devon Rex.",
"upgrades": { "age_grow": 120, "into": "mon_cat_devon_rex" }
},
{
"id": "mon_cat_sphynx",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "Sphynx cat",
"description": "The Sphynx cat has practically no fur on its body, exposing its curiously wrinkled skin.",
"reproduction": { "baby_monster": "mon_cat_sphynx_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_sphynx_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "Sphynx kitten",
"description": "An almost total lack of fur on this kitten suggests it is of the hairless Sphynx breed.",
"upgrades": { "age_grow": 120, "into": "mon_cat_sphynx" }
},
{
"id": "mon_cat_tabby",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "tabby cat",
"description": "Marked with the characteristic 'M' on its forehead and decorated with swirling stripes, the tabby's markings must provide excellent camouflage.",
"reproduction": { "baby_monster": "mon_cat_tabby_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_tabby_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "tabby kitten",
"description": "Sharp lines around the eyes and familiar wavy stripes mark this kitten as a common tabby.",
"upgrades": { "age_grow": 120, "into": "mon_cat_tabby" }
},
{
"id": "mon_cat_calico",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "calico cat",
"description": "Partly white with patches of orange and black, the calico coloring tells you this cat is probably female. The Calico was the Maryland State cat (back when there were still states).",
"reproduction": { "baby_monster": "mon_cat_calico_kitten", "baby_count": 4, "baby_timer": 60 }
},
{
"id": "mon_cat_calico_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "calico kitten",
"description": "Splotches of tan and grey mark this young cat as a calico, and probably female.",
"upgrades": { "age_grow": 120, "into": "mon_cat_calico" }
},
{
"id": "mon_cat_chonker",
"type": "MONSTER",
"copy-from": "mon_cat",
"name": "golden chonker",
"description": "Lawd, he comin! This impressive feline would once have been celebrated on internet cat forums for its chonkiness and majestic golden mane. Appears surprisingly well-groomed for a feral cat.",
"volume": "8000 ml",
"weight": "10 kg",
"hp": 20,
"reproduction": { "baby_monster": "mon_cat_chonker_kitten", "baby_count": 8, "baby_timer": 60 }
},
{
"id": "mon_cat_chonker_kitten",
"type": "MONSTER",
"copy-from": "mon_cat_kitten",
"name": "yellow kitten",
"description": "This poor little kitten is starving! You wonder if you have some cat food around…",
"upgrades": { "age_grow": 120, "into": "mon_cat_chonker" }
},
{
"id": "mon_chipmunk",
"type": "MONSTER",
Expand Down