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

Monster name to object #38868

Merged
merged 2 commits into from
Mar 18, 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
2 changes: 1 addition & 1 deletion data/json/monsters/fungus.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@
{
"id": "mon_spore",
"type": "MONSTER",
"name": "spore cloud",
"name": { "str": "spore cloud" },
"description": "A mass of spores the size of a balled fist, wafting around in the air.",
"default_faction": "fungus",
"species": [ "FUNGUS" ],
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/mammal.json
Original file line number Diff line number Diff line change
Expand Up @@ -1929,7 +1929,7 @@
{
"id": "mon_squirrel",
"type": "MONSTER",
"name": "squirrel",
"name": { "str": "squirrel" },
"description": "A small granivorous rodent with a long bushy tail, often seen darting amid the branches of trees. A skittish varmint with an expression of unwavering austerity, it is the mortal enemy of cat and dog alike.",
"default_faction": "small_animal",
"bodytype": "pig",
Expand All @@ -1956,7 +1956,7 @@
{
"id": "mon_squirrel_red",
"type": "MONSTER",
"name": "squirrel",
"name": { "str": "squirrel" },
"description": "A tiny opportunistic rodent with a long bushy tail. The pine squirrel is clever and cute, and hunted by nearly everything in the woods with a taste for meat.",
"default_faction": "small_animal",
"bodytype": "pig",
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/nether.json
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
{
"id": "mon_headless_dog_thing",
"type": "MONSTER",
"name": "tentacle dog",
"name": { "str": "tentacle dog" },
"description": "A dog's body with a mass of ropey, black tentacles reaching out from its head.",
"default_faction": "mutant",
"bodytype": "dog",
Expand Down Expand Up @@ -742,7 +742,7 @@
{
"id": "mon_thing",
"type": "MONSTER",
"name": "thing",
"name": { "str": "thing" },
"description": "An amorphous black creature, detaching and sprouting tentacles without any apparent pause.",
"default_faction": "mutant",
"bodytype": "blob",
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/slimes.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
{
"id": "mon_blob_small",
"type": "MONSTER",
"name": "small blob",
"name": { "str": "small blob" },
"description": "A small black blob of viscous goo, oozing across the ground like a glob of living oil.",
"default_faction": "blob",
"bodytype": "blob",
Expand Down
12 changes: 6 additions & 6 deletions data/json/monsters/triffid.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
{
"id": "mon_triffid_sprig",
"type": "MONSTER",
"name": "triffid sprig",
"name": { "str": "triffid sprig" },
"description": "A teeny-tiny triffid that has recently germinated. Like a house cat, you know it wants to eat you but it just can't figure out how.",
"default_faction": "triffid",
"species": [ "PLANT" ],
Expand All @@ -123,7 +123,7 @@
{
"id": "mon_triffid_young",
"type": "MONSTER",
"name": "triffid sprout",
"name": { "str": "triffid sprout" },
"description": "A small triffid, only a few feet tall. It has not yet developed bark, but its sting is still sharp and deadly.",
"default_faction": "triffid",
"species": [ "PLANT" ],
Expand All @@ -148,7 +148,7 @@
{
"id": "mon_triffid",
"type": "MONSTER",
"name": "triffid",
"name": { "str": "triffid" },
"description": "A creeping animate plant, growing as tall as a moose. It has a single bark-covered stalk supporting a flowery head with a paralyzing sting concealed within.",
"default_faction": "triffid",
"species": [ "PLANT" ],
Expand All @@ -174,7 +174,7 @@
{
"id": "mon_triffid_queen",
"type": "MONSTER",
"name": "triffid queen",
"name": { "str": "triffid queen" },
"description": "A ponderous and particularly arborescent triffid. It has enormous red petals surrounded by a haze of spores, and two thick barbed vines stick out from the stems like wary harpoons.",
"default_faction": "triffid",
"species": [ "PLANT" ],
Expand Down Expand Up @@ -260,7 +260,7 @@
{
"id": "mon_triffid_flower",
"type": "MONSTER",
"name": "triffid flower",
"name": { "str": "triffid flower" },
"description": "A giant plant with a thick stalk adorned by a purple flower. Its petals are open with ominous shine in center.",
"default_faction": "triffid",
"species": [ "PLANT" ],
Expand All @@ -283,7 +283,7 @@
{
"id": "mon_triffid_heart",
"type": "MONSTER",
"name": "triffid heart",
"name": { "str": "triffid heart" },
"description": "A knot of tubular roots, flowing with sap and beating like a heart. Strands of vascular tissue reach out to the surrounding root walls.",
"default_faction": "triffid",
"species": [ "PLANT" ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed-classic.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@
{
"id": "mon_zombie_tough",
"type": "MONSTER",
"name": "tough zombie",
"name": { "str": "tough zombie" },
"description": "Once an athletic human, now a brutal monster. Its facial features are twisted into an expression of pure rage.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed_acid.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
{
"id": "mon_zombie_spitter",
"type": "MONSTER",
"name": "spitter zombie",
"name": { "str": "spitter zombie" },
"description": "A hunched human body with its eyes pushed up into its forehead and drooping cheeks, most of its face is occupied by a puckered mouth. Its stomach is swollen and nearly translucent, with a sickly yellow tint.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down
4 changes: 2 additions & 2 deletions data/json/monsters/zed_children.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
{
"id": "mon_zombie_snotgobbler",
"type": "MONSTER",
"name": "snotgobbler",
"name": { "str": "snotgobbler" },
"description": "This swollen, gooey looking mutant child looks bad, even for a zombie. Maybe that's why it seems to want a hug so badly.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down Expand Up @@ -208,7 +208,7 @@
{
"id": "mon_zombie_sproglodyte",
"type": "MONSTER",
"name": "sproglodyte",
"name": { "str": "sproglodyte" },
"description": "This crouching child-mutant's face is dominated by a pair of huge black eyes and its fingertips end in sharp claws.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed_fusion.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
{
"id": "mon_zombie_crushed_giant",
"type": "MONSTER",
"name": "trapped tendril",
"name": { "str": "trapped tendril" },
"description": "A great tendril of mutated flesh and sharpened bone. Emergent from a crevice in the ruined floor, hundreds of human limbs seek freedom and writhe incessantly from underneath its grotesque carapace. As enormous as it may already be, you feel certain that this is just part of a creature much bigger, for when it moves, you can feel this whole ruin tremble, as if an unseen giant struggled against the weight of its concrete tomb.",
"default_faction": "zombie",
"volume": "875000 ml",
Expand Down
6 changes: 3 additions & 3 deletions data/json/monsters/zed_misc.json
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@
{
"id": "mon_zombie_smoker",
"type": "MONSTER",
"name": "smoker zombie",
"name": { "str": "smoker zombie" },
"description": "A blackened and twisted naked human body, strips of flesh hang from its body, and it emits a constant haze of thick black smoke.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down Expand Up @@ -1038,7 +1038,7 @@
{
"id": "mon_zombie_swimmer",
"type": "MONSTER",
"name": "swimmer zombie",
"name": { "str": "swimmer zombie" },
"description": "A slick and glistening human body. Its hands and feet are webbed, and it is clad in swimwear.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down Expand Up @@ -1117,7 +1117,7 @@
{
"id": "mon_zombie_thorny",
"type": "MONSTER",
"name": "thorny shambler",
"name": { "str": "thorny shambler" },
"description": "A shambling undead humanoid, body overgrown with a tangled mass of otherworldly vegetation. Hunched over and dragging its feet as it moves, the bramble utterly enveloping its upper half twitches and moves with a life of its own, tendrils tipped with a paralytic sting.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down
2 changes: 1 addition & 1 deletion data/json/monsters/zed_survivor.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"id": "mon_zombie_survivor",
"type": "MONSTER",
"name": "survivor zombie",
"name": { "str": "survivor zombie" },
"description": "Still wearing the tattered remnants of improvised armor and weaponry, it is plain to see that this zombie was once a survivor like you.",
"default_faction": "zombie",
"bodytype": "human",
Expand Down