Skip to content

Commit

Permalink
Blobs are slimes. name them such. (#42287)
Browse files Browse the repository at this point in the history
  • Loading branch information
esotericist authored Jul 21, 2020
1 parent 5437b2a commit 4795a1e
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 26 deletions.
4 changes: 2 additions & 2 deletions data/json/items/comestibles/other.json
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
28 changes: 14 additions & 14 deletions data/json/monsters/slimes.json
Original file line number Diff line number Diff line change
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" },
"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.",
"default_faction": "blob",
"name": { "str": "brain slime" },
"description": "A gigantic black blob of viscous goo, oozing across the ground like a glob of living oil. Other slimes seem to swarm around it.",
"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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
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
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"type": "MONSTER_FACTION",
"name": "zombie",
"friendly": [
"blob",
"slime",
"cult",
"zombie_aquatic",
"crackers",
Expand Down

0 comments on commit 4795a1e

Please sign in to comment.