From 07419efe5bed8f0b4fbb4b484b60c0b73b68c665 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Wed, 18 Mar 2020 15:01:48 +0100 Subject: [PATCH 1/2] Monster name to object --- data/json/monsters/fungus.json | 2 +- data/json/monsters/mammal.json | 4 ++-- data/json/monsters/nether.json | 4 ++-- data/json/monsters/triffid.json | 4 ++-- data/json/monsters/zed-classic.json | 2 +- data/json/monsters/zed_acid.json | 2 +- data/json/monsters/zed_children.json | 4 ++-- data/json/monsters/zed_fusion.json | 2 +- data/json/monsters/zed_misc.json | 6 +++--- data/json/monsters/zed_survivor.json | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/data/json/monsters/fungus.json b/data/json/monsters/fungus.json index 1ac0aa285a668..aee1bf00e181b 100644 --- a/data/json/monsters/fungus.json +++ b/data/json/monsters/fungus.json @@ -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" ], diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index a2374b24b8b0b..9bcad31075bed 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -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", @@ -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", diff --git a/data/json/monsters/nether.json b/data/json/monsters/nether.json index 16e9b1593e338..f2453a17f3e3b 100644 --- a/data/json/monsters/nether.json +++ b/data/json/monsters/nether.json @@ -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", @@ -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", diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json index 7e5f8c9f72798..8148bbf59f5c2 100644 --- a/data/json/monsters/triffid.json +++ b/data/json/monsters/triffid.json @@ -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" ], @@ -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" ], diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index cdc87a6d46cdf..17f74d0a44161 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -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", diff --git a/data/json/monsters/zed_acid.json b/data/json/monsters/zed_acid.json index 6f5c465031c1c..a9c2b5c6805b3 100644 --- a/data/json/monsters/zed_acid.json +++ b/data/json/monsters/zed_acid.json @@ -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", diff --git a/data/json/monsters/zed_children.json b/data/json/monsters/zed_children.json index b17c25ca0ee3e..3b418b4f68ba0 100644 --- a/data/json/monsters/zed_children.json +++ b/data/json/monsters/zed_children.json @@ -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", @@ -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", diff --git a/data/json/monsters/zed_fusion.json b/data/json/monsters/zed_fusion.json index c286ea17c1b74..b7c3e7084acba 100644 --- a/data/json/monsters/zed_fusion.json +++ b/data/json/monsters/zed_fusion.json @@ -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", diff --git a/data/json/monsters/zed_misc.json b/data/json/monsters/zed_misc.json index 9eef4cd5551d9..7cda11cc0d3c3 100644 --- a/data/json/monsters/zed_misc.json +++ b/data/json/monsters/zed_misc.json @@ -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", @@ -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", @@ -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", diff --git a/data/json/monsters/zed_survivor.json b/data/json/monsters/zed_survivor.json index 73a5ef7bf25eb..55ed5291b67a7 100644 --- a/data/json/monsters/zed_survivor.json +++ b/data/json/monsters/zed_survivor.json @@ -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", From c8a1ed5982e41c83c9bb7db75e7d6a5d68bb5c70 Mon Sep 17 00:00:00 2001 From: snipercup <50166150+snipercup@users.noreply.github.com> Date: Wed, 18 Mar 2020 15:02:30 +0100 Subject: [PATCH 2/2] Name to object --- data/json/monsters/slimes.json | 2 +- data/json/monsters/triffid.json | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/monsters/slimes.json b/data/json/monsters/slimes.json index c2d73d5511fb6..461cd8d64bec5 100644 --- a/data/json/monsters/slimes.json +++ b/data/json/monsters/slimes.json @@ -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", diff --git a/data/json/monsters/triffid.json b/data/json/monsters/triffid.json index 8148bbf59f5c2..46feb4876e260 100644 --- a/data/json/monsters/triffid.json +++ b/data/json/monsters/triffid.json @@ -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" ], @@ -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" ], @@ -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" ], @@ -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" ],