summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-data.h
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r--crawl-ref/source/mon-data.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index ef3c9e90c7..d1ba41caec 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -645,10 +645,21 @@ static monsterentry mondata[] = {
// fungi ('f')
{
+ MONS_TOADSTOOL, 'f', BROWN, "toadstool",
+ M_NO_EXP_GAIN | M_STATIONARY,
+ MR_RES_POISON,
+ 0, 10, MONS_FUNGUS, MONS_TOADSTOOL, MH_PLANT, MAG_IMMUNE,
+ { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
+ { 1, 2, 2, 0 },
+ 1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
+ HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
+},
+
+{
MONS_FUNGUS, 'f', LIGHTGREY, "fungus",
M_NO_EXP_GAIN | M_STATIONARY,
MR_RES_POISON,
- 0, 10, MONS_PLANT, MONS_FUNGUS, MH_PLANT, MAG_IMMUNE,
+ 0, 10, MONS_FUNGUS, MONS_FUNGUS, MH_PLANT, MAG_IMMUNE,
{ AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 3, 5, 0 },
1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
@@ -656,27 +667,16 @@ static monsterentry mondata[] = {
},
{
- MONS_WANDERING_MUSHROOM, 'f', BROWN, "wandering mushroom",
+ MONS_WANDERING_MUSHROOM, 'f', RED, "wandering mushroom",
M_NO_FLAGS,
MR_RES_POISON,
- 0, 10, MONS_PLANT, MONS_WANDERING_MUSHROOM, MH_PLANT, -3,
+ 0, 10, MONS_FUNGUS, MONS_WANDERING_MUSHROOM, MH_PLANT, -3,
{ {AT_SPORE, AF_CONFUSE, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 8, 3, 5, 0 },
5, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
},
-{
- MONS_TOADSTOOL, 'f', BROWN, "toadstool",
- M_NO_EXP_GAIN | M_STATIONARY,
- MR_RES_POISON,
- 0, 10, MONS_PLANT, MONS_TOADSTOOL, MH_PLANT, MAG_IMMUNE,
- { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
- { 1, 2,2, 0 },
- 1, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, I_PLANT,
- HT_LAND, 10, DEFAULT_ENERGY, MONUSE_NOTHING, SIZE_TINY
-},
-
// goblins ('g')
{
MONS_GOBLIN, 'g', LIGHTGREY, "goblin",