diff options
| -rw-r--r-- | crawl-ref/source/mon-data.h | 66 | ||||
| -rwxr-xr-x | crawl-ref/source/util/db_lint | 2 |
2 files changed, 18 insertions, 50 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 4a9d293a57..15176ee9a9 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -253,7 +253,7 @@ static monsterentry mondata[] = // Used for genus monsters (which are used for grouping monsters by how they // work and in comes-into-view messages. -#define DUMMY_GENUS(id, glyph, colour, name) \ +#define DUMMY(id, glyph, colour, name) \ { \ (id), (glyph), (colour), (name), \ M_CANT_SPAWN, \ @@ -1138,7 +1138,7 @@ static monsterentry mondata[] = MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_LITTLE, MON_SHAPE_QUADRUPED }, -DUMMY_GENUS(MONS_BEAR, 'h', LIGHTGREY, "bear") +DUMMY(MONS_BEAR, 'h', LIGHTGREY, "bear") { MONS_POLAR_BEAR, 'h', LIGHTBLUE, "polar bear", @@ -1241,7 +1241,7 @@ DUMMY_GENUS(MONS_BEAR, 'h', LIGHTGREY, "bear") }, // drakes ('k') -DUMMY_GENUS(MONS_DRAKE, 'k', LIGHTGREY, "drake") +DUMMY(MONS_DRAKE, 'k', LIGHTGREY, "drake") { MONS_SWAMP_DRAKE, 'k', BROWN, "swamp drake", @@ -1305,7 +1305,7 @@ DUMMY_GENUS(MONS_DRAKE, 'k', LIGHTGREY, "drake") }, // lizards ('l') -DUMMY_GENUS(MONS_GIANT_LIZARD, 'l', LIGHTGREY, "giant lizard") +DUMMY(MONS_GIANT_LIZARD, 'l', LIGHTGREY, "giant lizard") { MONS_GIANT_NEWT, 'l', GREEN, "giant newt", @@ -2070,7 +2070,7 @@ DUMMY_GENUS(MONS_GIANT_LIZARD, 'l', LIGHTGREY, "giant lizard") MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE, MON_SHAPE_QUADRUPED_TAILLESS }, -DUMMY_GENUS(MONS_CRAB, 't', LIGHTGREY, "crab") +DUMMY(MONS_CRAB, 't', LIGHTGREY, "crab") { MONS_FIRE_CRAB, 't', LIGHTRED, "fire crab", @@ -2258,7 +2258,7 @@ DUMMY_GENUS(MONS_CRAB, 't', LIGHTGREY, "crab") MONUSE_NOTHING, MONEAT_NOTHING, SIZE_LARGE, MON_SHAPE_SNAIL }, -// dummy genus monster; not using DUMMY_GENUS since it's also a dummy species +// dummy genus monster; not using DUMMY since it's also a dummy species { MONS_ELEPHANT_SLUG, 'w', WHITE, "elephant slug", M_NO_SKELETON| M_CANT_SPAWN, @@ -2412,7 +2412,7 @@ DUMMY_GENUS(MONS_CRAB, 't', LIGHTGREY, "crab") MONUSE_NOTHING, MONEAT_NOTHING, SIZE_TINY, MON_SHAPE_INSECT_WINGED }, -DUMMY_GENUS(MONS_MOTH, 'y', WHITE, "moth") +DUMMY(MONS_MOTH, 'y', WHITE, "moth") { MONS_GHOST_MOTH, 'y', MAGENTA, "ghost moth", @@ -2623,7 +2623,7 @@ DUMMY_GENUS(MONS_MOTH, 'y', WHITE, "moth") }, // cyclopes and giants ('C') -DUMMY_GENUS(MONS_GIANT, 'C', LIGHTGREY, "giant") +DUMMY(MONS_GIANT, 'C', LIGHTGREY, "giant") { MONS_HILL_GIANT, 'C', LIGHTRED, "hill giant", @@ -2713,7 +2713,7 @@ DUMMY_GENUS(MONS_GIANT, 'C', LIGHTGREY, "giant") }, // dragons ('D') -DUMMY_GENUS(MONS_DRAGON, 'D', GREEN, "dragon") +DUMMY(MONS_DRAGON, 'D', GREEN, "dragon") { MONS_WYVERN, 'D', LIGHTRED, "wyvern", @@ -2893,7 +2893,7 @@ DUMMY_GENUS(MONS_DRAGON, 'D', GREEN, "dragon") }, // elementals (E) -DUMMY_GENUS(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental") +DUMMY(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental") { MONS_EARTH_ELEMENTAL, 'E', ETC_EARTH, "earth elemental", @@ -3219,17 +3219,7 @@ DUMMY_GENUS(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental") MONUSE_NOTHING, MONEAT_NOTHING, SIZE_SMALL, MON_SHAPE_BLOB }, -{ // not an actual monster, it's here just to allow recoloring - MONS_MERGED_SLIME_CREATURE, 'J', LIGHTGREEN, "merged slime creature", - M_CANT_SPAWN, - MR_RES_POISON | MR_RES_ASPHYX, - 0, 3, MONS_JELLY, MONS_SLIME_CREATURE, MH_NATURAL, -3, - { {AT_HIT, AF_PLAIN, 22}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 11, 3, 5, 0 }, - 1, 4, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, - I_PLANT, HT_AMPHIBIOUS, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_NOTHING, MONEAT_NOTHING, SIZE_MEDIUM, MON_SHAPE_BLOB -}, +DUMMY(MONS_MERGED_SLIME_CREATURE, 'J', LIGHTGREEN, "merged slime creature") { MONS_AZURE_JELLY, 'J', LIGHTBLUE, "azure jelly", @@ -3779,7 +3769,7 @@ DUMMY_GENUS(MONS_ELEMENTAL, 'E', LIGHTGREY, "elemental") }, // snakes ('S') -DUMMY_GENUS(MONS_SNAKE, 'S', LIGHTGREEN, "snake") +DUMMY(MONS_SNAKE, 'S', LIGHTGREEN, "snake") { MONS_BALL_PYTHON, 'S', GREEN, "ball python", @@ -4015,7 +4005,7 @@ DUMMY_GENUS(MONS_SNAKE, 'S', LIGHTGREEN, "snake") }, // incorporeal undead ('W') -{ // dummy genus monster +{ // dummy genus monster, but also used for removed monsters MONS_GHOST, 'W', WHITE, "ghost", M_INSUBSTANTIAL | M_NO_POLY_TO, MR_NO_FLAGS, @@ -4722,18 +4712,8 @@ DUMMY_GENUS(MONS_SNAKE, 'S', LIGHTGREEN, "snake") MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM, MON_SHAPE_HUMANOID }, -// never spawned as a monster. -{ - MONS_PLAYER, '@', LIGHTGREY, "player", - M_SPEAKS | M_CANT_SPAWN, - MR_NO_FLAGS, - 0, 15, MONS_PLAYER_ILLUSION, MONS_PLAYER_ILLUSION, MH_NATURAL, -5, - { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 4, 2, 3, 0 }, - 0, 10, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SHOUT, - I_HIGH /*uh huh, sure sure*/, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_WEAPONS_ARMOUR, MONEAT_NOTHING, SIZE_MEDIUM, MON_SHAPE_HUMANOID -}, +// 'dummy' a fairly accurate description +DUMMY(MONS_PLAYER, '@', LIGHTGREY, "player") // player illusion (Mara) - stats are stored in ghost struct. Undead/demonic // flags are set based on the current player's species! @@ -5459,21 +5439,11 @@ DUMMY_GENUS(MONS_SNAKE, 'S', LIGHTGREEN, "snake") }, // trees and related creatures ('7') -{ // dummy for transformed display - MONS_ANIMATED_TREE, '7', ETC_TREE, "animated tree", - M_STATIONARY | M_CANT_SPAWN, - MR_RES_POISON | MR_VUL_FIRE, - 0, 10, MONS_PLANT, MONS_ANIMATED_TREE, MH_PLANT, MAG_IMMUNE, - { {AT_HIT, AF_CRUSH, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, - { 20, 3, 5, 0 }, - 25, 0, MST_NO_SPELLS, CE_NOCORPSE, Z_NOZOMBIE, S_SILENT, - I_PLANT, HT_LAND, FL_NONE, 10, DEFAULT_ENERGY, - MONUSE_STARTING_EQUIPMENT, MONEAT_NOTHING, SIZE_GIANT, MON_SHAPE_PLANT -}, +DUMMY(MONS_ANIMATED_TREE, '7', ETC_TREE, "animated tree") // non-living creatures // golems ('8') -DUMMY_GENUS(MONS_GOLEM, '8', LIGHTGREY, "golem") +DUMMY(MONS_GOLEM, '8', LIGHTGREY, "golem") { MONS_IRON_GOLEM, '8', CYAN, "iron golem", @@ -5714,7 +5684,7 @@ DUMMY_GENUS(MONS_GOLEM, '8', LIGHTGREY, "golem") }, // Demon in hell. Currently only used as genus/species for hell guardians. -{ // dummy genus monster -- used as a species so no DUMMY_GENUS +{ // dummy genus monster -- used as a species so not a DUMMY MONS_HELL_LORD, '&', BLACK, "hell lord", M_FIGHTER | M_SPELLCASTER | M_SPEAKS | M_CANT_SPAWN, MR_RES_POISON, diff --git a/crawl-ref/source/util/db_lint b/crawl-ref/source/util/db_lint index fcfa026f7e..ebbd237d67 100755 --- a/crawl-ref/source/util/db_lint +++ b/crawl-ref/source/util/db_lint @@ -270,8 +270,6 @@ if (read_file("descript/monsters")) 'the Serpent of Hell', # overridden descriptions 'player illusion', - # reglyphing/colouring dummies - 'player', 'merged slime creature', 'animated tree', # replacement for removed creatures 'ghost', # species-only monsters |