diff options
author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-03 10:30:18 +0000 |
---|---|---|
committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-02-03 10:30:18 +0000 |
commit | f19756c625c050717f9a86419de62cd99c5c468c (patch) | |
tree | b8f683639f5871355b16995333d82ebb605ad4ba /crawl-ref | |
parent | be5d26b600e0660cfe5f0906dfccec25ff2bbcdb (diff) | |
download | crawl-ref-f19756c625c050717f9a86419de62cd99c5c468c.tar.gz crawl-ref-f19756c625c050717f9a86419de62cd99c5c468c.zip |
Gave all M_INSUBSTANTIAL monsters MR_RES_STICKY_FLAME. (I prefer this solution
to a code-level solution; we give all demons res poison manually, after all.)
Fixes [2540348].
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8878 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/mon-data.h | 35 | ||||
-rw-r--r-- | crawl-ref/source/mon-util.cc | 3 |
2 files changed, 20 insertions, 18 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index c99ea94573..10aca83dd4 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -1158,7 +1158,7 @@ static monsterentry mondata[] = { { MONS_HUNGRY_GHOST, 'p', GREEN, "hungry ghost", M_SENSE_INVIS | M_FLIES | M_EVIL | M_INSUBSTANTIAL | M_SPEAKS, - MR_RES_POISON | mrd(MR_RES_COLD, 2), + MR_RES_POISON | mrd(MR_RES_COLD, 2) | MR_RES_STICKY_FLAME, 0, 10, MONS_PHANTOM, MONS_HUNGRY_GHOST, MH_UNDEAD, -4, { {AT_HIT, AF_HUNGER, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 7, 3, 5, 0 }, @@ -1182,7 +1182,7 @@ static monsterentry mondata[] = { MONS_PLAYER_GHOST, 'p', WHITE, "player ghost", M_FIGHTER | M_SPEAKS | M_SPELLCASTER | M_ACTUAL_SPELLS | M_FLIES | M_EVIL | M_UNIQUE | M_INSUBSTANTIAL, - MR_RES_POISON, + MR_RES_POISON | MR_RES_STICKY_FLAME, 0, 15, MONS_PHANTOM, MONS_PLAYER_GHOST, MH_UNDEAD, -5, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 4, 2, 3, 0 }, @@ -1193,7 +1193,8 @@ static monsterentry mondata[] = { { MONS_INSUBSTANTIAL_WISP, 'p', LIGHTGREY, "insubstantial wisp", M_LEVITATE | M_SPECIAL_ABILITY | M_INSUBSTANTIAL, - mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 2), + mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 2) + | MR_RES_STICKY_FLAME, 0, 17, MONS_INSUBSTANTIAL_WISP, MONS_INSUBSTANTIAL_WISP, MH_NONLIVING, MAG_IMMUNE, { {AT_HIT, AF_BLINK, 12}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 1, 2, 0 }, @@ -1363,7 +1364,8 @@ static monsterentry mondata[] = { { MONS_FIRE_VORTEX, 'v', RED, "fire vortex", M_LEVITATE | M_CONFUSED | M_INSUBSTANTIAL | M_GLOWS, - MR_RES_POISON | mrd(MR_RES_FIRE, 3) | MR_VUL_COLD | MR_RES_ELEC, + MR_RES_POISON | mrd(MR_RES_FIRE, 3) | MR_VUL_COLD | MR_RES_ELEC + | MR_RES_STICKY_FLAME, 0, 5, MONS_FIRE_VORTEX, MONS_FIRE_VORTEX, MH_NONLIVING, MAG_IMMUNE, { {AT_HIT, AF_FIRE, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, @@ -1374,7 +1376,8 @@ static monsterentry mondata[] = { { MONS_SPATIAL_VORTEX, 'v', BLACK, "spatial vortex", M_LEVITATE | M_CONFUSED | M_INSUBSTANTIAL | M_GLOWS, - MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC, + MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC + | MR_RES_STICKY_FLAME, 0, 5, MONS_FIRE_VORTEX, MONS_SPATIAL_VORTEX, MH_NONLIVING, MAG_IMMUNE, { {AT_HIT, AF_DISTORT, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 6, 6, 0 }, @@ -1386,7 +1389,7 @@ static monsterentry mondata[] = { { MONS_AIR_ELEMENTAL, 'v', LIGHTGREY, "air elemental", M_LEVITATE | M_SEE_INVIS | M_FLIES | M_INSUBSTANTIAL | M_GLOWS, - mrd(MR_RES_ELEC, 3) | MR_RES_POISON, + mrd(MR_RES_ELEC, 3) | MR_RES_POISON | MR_RES_STICKY_FLAME, 0, 5, MONS_EARTH_ELEMENTAL, MONS_AIR_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, @@ -1408,7 +1411,8 @@ static monsterentry mondata[] = { { MONS_FIRE_ELEMENTAL, '#', YELLOW, "fire elemental", M_FLIES | M_INSUBSTANTIAL | M_GLOWS, - MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC, + MR_RES_POISON | MR_RES_HELLFIRE | MR_VUL_COLD | MR_RES_ELEC + | MR_RES_STICKY_FLAME, 0, 10, MONS_EARTH_ELEMENTAL, MONS_FIRE_ELEMENTAL, MH_NONLIVING, MAG_IMMUNE, { {AT_HIT, AF_FIRE, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, @@ -2030,7 +2034,7 @@ static monsterentry mondata[] = { { MONS_GIANT_SPORE, 'G', GREEN, "giant spore", M_LEVITATE | M_INSUBSTANTIAL, - MR_RES_POISON | MR_RES_ASPHYX, + MR_RES_POISON | MR_RES_ASPHYX | MR_RES_STICKY_FLAME, 0, 10, MONS_PLANT, MONS_GIANT_SPORE, MH_NATURAL, -3, { {AT_HIT, AF_PLAIN, 1}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 1, 0, 0, 1 }, @@ -2775,7 +2779,7 @@ static monsterentry mondata[] = { { MONS_SHADOW_WRAITH, 'W', BLUE, "shadow wraith", M_LEVITATE | M_SEE_INVIS | M_INVIS | M_EVIL | M_INSUBSTANTIAL, - MR_RES_POISON, + MR_RES_POISON | MR_RES_STICKY_FLAME, 0, 15, MONS_WRAITH, MONS_SHADOW_WRAITH, MH_UNDEAD, -8, { {AT_HIT, AF_DRAIN_XP, 20}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 10, 3, 5, 0 }, @@ -3346,7 +3350,7 @@ static monsterentry mondata[] = { { MONS_SMOKE_DEMON, '4', LIGHTGREY, "smoke demon", M_SPELLCASTER | M_FLIES | M_EVIL | M_INSUBSTANTIAL, - MR_RES_POISON | mrd(MR_RES_FIRE, 2), + MR_RES_POISON | mrd(MR_RES_FIRE, 2) | MR_RES_STICKY_FLAME, 0, 12, MONS_SMOKE_DEMON, MONS_SMOKE_DEMON, MH_DEMONIC, -6, { {AT_HIT, AF_PLAIN, 8}, {AT_HIT, AF_PLAIN, 5}, {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK }, @@ -3470,7 +3474,7 @@ static monsterentry mondata[] = { { MONS_CHAOS_SPAWN, '3', EC_RANDOM, "chaos spawn", M_SEE_INVIS | M_EVIL | M_INSUBSTANTIAL, - MR_NO_FLAGS, + MR_RES_STICKY_FLAME, 0, 12, MONS_CHAOS_SPAWN, MONS_CHAOS_SPAWN, MH_DEMONIC, -7, { {AT_RANDOM, AF_CHAOS, 21}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 6, 3, 5, 0 }, @@ -3809,7 +3813,8 @@ static monsterentry mondata[] = { MONS_BALL_LIGHTNING, '*', LIGHTCYAN, "ball lightning", M_FLIES | M_CONFUSED | M_SPELLCASTER | M_SPECIAL_ABILITY | M_INSUBSTANTIAL, - mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 3), + mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD + | MR_RES_STICKY_FLAME, 3), 0, 20, MONS_BALL_LIGHTNING, MONS_BALL_LIGHTNING, MH_NONLIVING, MAG_IMMUNE, { {AT_HIT, AF_PLAIN, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 0, 0, 1 }, @@ -3821,7 +3826,7 @@ static monsterentry mondata[] = { MONS_ORB_OF_FIRE, '*', RED, "orb of fire", M_SPELLCASTER | M_FLIES | M_SEE_INVIS | M_INSUBSTANTIAL | M_GLOWS, mrd(MR_RES_FIRE | MR_RES_HELLFIRE | MR_RES_POISON, 3) | MR_RES_COLD - | MR_RES_ELEC, + | MR_RES_ELEC | MR_RES_STICKY_FLAME, 0, 10, MONS_ORB_OF_FIRE, MONS_ORB_OF_FIRE, MH_NONLIVING, MAG_IMMUNE, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 30, 0, 0, 150 }, @@ -3834,7 +3839,7 @@ static monsterentry mondata[] = { MONS_VAPOUR, '#', LIGHTGREY, "vapour", M_SPELLCASTER | M_LEVITATE | M_SEE_INVIS | M_INVIS | M_CONFUSED | M_INSUBSTANTIAL, - mrd(MR_RES_ELEC, 3) | MR_RES_POISON, + mrd(MR_RES_ELEC, 3) | MR_RES_POISON | MR_RES_STICKY_FLAME, 0, 21, MONS_VAPOUR, MONS_VAPOUR, MH_NONLIVING, MAG_IMMUNE, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 12, 2, 3, 0 }, @@ -3845,7 +3850,7 @@ static monsterentry mondata[] = { { MONS_SHADOW, ' ', BLACK, "shadow", M_SEE_INVIS | M_EVIL | M_INSUBSTANTIAL | M_GLOWS, - MR_RES_POISON | mrd(MR_RES_COLD, 3), + MR_RES_POISON | mrd(MR_RES_COLD, 3) | MR_RES_STICKY_FLAME, 0, 10, MONS_WRAITH, MONS_SHADOW, MH_UNDEAD, -5, { {AT_HIT, AF_DRAIN_STR, 5}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 3, 3, 5, 0 }, diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc index f1e51e9e71..7e1079b76d 100644 --- a/crawl-ref/source/mon-util.cc +++ b/crawl-ref/source/mon-util.cc @@ -67,9 +67,6 @@ struct mon_spellbook mon_display monster_symbols[NUM_MONSTERS]; -// Really important extern -- screen redraws suck w/o it! {dlb} -FixedVector < unsigned short, 1000 > mcolour; - static bool initialized_randmons = false; static std::vector<monster_type> monsters_by_habitat[NUM_HABITATS]; |