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

Jump to bottom

Blobs are slimes. name them such. #42287

Merged
merged 4 commits into from Jul 21, 2020
Merged

Blobs are slimes. name them such. #42287

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
72753b6
rename blobs to slimes
esotericist Jul 19, 2020
a7c1abf
rename the blob item, too
esotericist Jul 19, 2020
ab17828
also faction and species
esotericist Jul 19, 2020
f7f4ee4
Update data/json/monsters/slimes.json
esotericist Jul 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions data/json/items/comestibles/other.json
View file
Open in desktop
Expand Up @@ -18,14 +18,14 @@
"type": "COMESTIBLE",
"id": "slime_scrap",
"category": "other",
"name": { "str": "blob glob" },
"name": { "str": "slime glob" },
"weight": "238 g",
"color": "dark_gray",
"use_action": [ "POISON" ],
"comestible_type": "FOOD",
"symbol": "%",
"calories": 174,
"description": "A little hunk of glop that fell off a blob monster. It doesn't seem hostile, but it does wiggle occasionally.",
"description": "A little hunk of glop that fell off a slime monster. It doesn't seem hostile, but it does wiggle occasionally.",
"price": 0,
"price_postapoc": 0,
"volume": "250 ml",
Expand Down
8 changes: 4 additions & 4 deletions data/json/monster_factions.json
View file
Open in desktop
Expand Up @@ -17,26 +17,26 @@
{
"type": "MONSTER_FACTION",
"name": "zombie",
"friendly": [ "blob", "cult", "zombie_aquatic" ],
"friendly": [ "slime", "cult", "zombie_aquatic" ],
"neutral": [ "small_animal", "insect", "fish" ],
"by_mood": "bee"
},
{
"type": "MONSTER_FACTION",
"name": "zombie_aquatic",
"friendly": [ "blob", "cult", "zombie" ],
"friendly": [ "slime", "cult", "zombie" ],
"neutral": [ "small_animal", "insect" ],
"by_mood": "bee"
},
{
"type": "MONSTER_FACTION",
"name": "blob",
"name": "slime",
"friendly": [ "zombie", "nether", "cult" ]
},
{
"type": "MONSTER_FACTION",
"name": "nether",
"friendly": [ "blob", "cult" ]
"friendly": [ "slime", "cult" ]
},
{
"type": "MONSTER_FACTION",
Expand Down
26 changes: 13 additions & 13 deletions data/json/monsters/slimes.json
View file
Open in desktop
Expand Up @@ -2,11 +2,11 @@
{
"id": "mon_blob",
"type": "MONSTER",
"name": { "str": "blob" },
"name": { "str": "slime" },
"description": "A black blob of viscous goo, oozing across the ground like a glob of living oil.",
"default_faction": "blob",
"default_faction": "slime",
"bodytype": "blob",
"species": [ "NETHER", "BLOB" ],
"species": [ "NETHER", "SLIME" ],
"diff": 1,
"volume": "62500 ml",
"weight": "81500 g",
Expand All @@ -32,11 +32,11 @@
{
"id": "mon_blob_brain",
"type": "MONSTER",
"name": { "str": "brain blob" },
"name": { "str": "brain slime" },
"description": "A gigantic black blob of viscous goo, oozing across the ground like a glob of living oil. Other blobs seem to swarm around it.",
esotericist marked this conversation as resolved.
Show resolved Hide resolved
"default_faction": "blob",
"default_faction": "slime",
"bodytype": "blob",
"species": [ "NETHER", "BLOB" ],
"species": [ "NETHER", "SLIME" ],
"diff": 5,
"volume": "875000 ml",
"weight": "200 kg",
Expand All @@ -60,11 +60,11 @@
{
"id": "mon_blob_large",
"type": "MONSTER",
"name": { "str": "big blob" },
"name": { "str": "big slime" },
"description": "A large black blob of viscous goo, oozing across the ground like a glob of living oil.",
"default_faction": "blob",
"default_faction": "slime",
"bodytype": "blob",
"species": [ "NETHER", "BLOB" ],
"species": [ "NETHER", "SLIME" ],
"diff": 1,
"volume": "92500 ml",
"weight": "120 kg",
Expand Down Expand Up @@ -92,11 +92,11 @@
{
"id": "mon_blob_small",
"type": "MONSTER",
"name": { "str": "small blob" },
"name": { "str": "small slime" },
"description": "A small black blob of viscous goo, oozing across the ground like a glob of living oil.",
"default_faction": "blob",
"default_faction": "slime",
"bodytype": "blob",
"species": [ "NETHER", "BLOB" ],
"species": [ "NETHER", "SLIME" ],
"diff": 1,
"volume": "30000 ml",
"weight": "40750 g",
Expand Down Expand Up @@ -124,7 +124,7 @@
"name": { "str": "amoebic mold" },
"description": "A formless slime mold the size of a cow. Crusty bits of cytoplasm fall away as it oozes across the ground.",
"bodytype": "blob",
"default_faction": "blob",
"default_faction": "slime",
"species": [ "NETHER" ],
"diff": 2,
"volume": "92500 ml",
Expand Down
4 changes: 2 additions & 2 deletions data/json/scent_types.json
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
"FISH",
"MUTANT",
"NETHER",
"BLOB",
"SLIME",
"FUNGUS",
"INSECT",
"SPIDER",
Expand Down Expand Up @@ -42,7 +42,7 @@
"FISH",
"MUTANT",
"NETHER",
"BLOB",
"SLIME",
"FUNGUS",
"INSECT",
"SPIDER",
Expand Down
4 changes: 2 additions & 2 deletions data/json/species.json
View file
Open in desktop
Expand Up @@ -49,8 +49,8 @@
},
{
"type": "SPECIES",
"id": "BLOB",
"description": "a blob",
"id": "SLIME",
"description": "a slime",
"footsteps": "plop."
},
{
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/monsters/monsters.json
View file
Open in desktop
Expand Up @@ -41,7 +41,7 @@
"default_faction": "ooze",
"bodytype": "blob",
"symbol": "O",
"species": [ "BLOB" ],
"species": [ "SLIME" ],
"diff": 1,
"volume": "62500 ml",
"weight": "81500 g",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/My_Sweet_Cataclysm/sweet_monster_factions.json
View file
Open in desktop
Expand Up @@ -39,7 +39,7 @@
"type": "MONSTER_FACTION",
"name": "zombie",
"friendly": [
"blob",
"slime",
"cult",
"zombie_aquatic",
"crackers",
Expand Down