diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-09 18:27:36 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-01-09 18:27:36 +0000 |
| commit | beb6500245eff6f70e18f278f199bf2060fb73b3 (patch) | |
| tree | 5398e77aa4bb0b476f47677fd4bb545cd98fee1d /crawl-ref/source/mon-data.h | |
| parent | 16cb681af88b7c4e448930660cf0de4d169f3b46 (diff) | |
| download | crawl-ref-beb6500245eff6f70e18f278f199bf2060fb73b3.tar.gz crawl-ref-beb6500245eff6f70e18f278f199bf2060fb73b3.zip | |
Revert r8362; I was misreading the code (oops).
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@8364 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-data.h')
| -rw-r--r-- | crawl-ref/source/mon-data.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h index 6c1f972f4d..cff7a7167b 100644 --- a/crawl-ref/source/mon-data.h +++ b/crawl-ref/source/mon-data.h @@ -466,7 +466,7 @@ static monsterentry mondata[] = { { MONS_DRACONIAN_SCORCHER, 'd', LIGHTRED, "draconian scorcher", M_SPELLCASTER | M_ACTUAL_SPELLS | M_COLD_BLOOD | M_EVIL | M_SPEAKS, - MR_RES_HELLFIRE, + MR_RES_FIRE | MR_RES_HELLFIRE, 900, 10, MONS_DRACONIAN, MONS_DRACONIAN, MH_NATURAL, -4, { {AT_HIT, AF_PLAIN, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, { 16, 4, 2, 0 }, @@ -3832,7 +3832,8 @@ 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_HELLFIRE | MR_RES_POISON, 3) | MR_RES_COLD | MR_RES_ELEC, + mrd(MR_RES_FIRE | MR_RES_HELLFIRE | MR_RES_POISON, 3) | MR_RES_COLD + | MR_RES_ELEC, 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 }, @@ -4500,8 +4501,8 @@ static monsterentry mondata[] = { { MONS_TEST_SPAWNER, 'X', WHITE, "test spawner", M_SPELLCASTER | M_STATIONARY | M_REGEN | M_INSUBSTANTIAL, - mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_HELLFIRE | MR_RES_COLD - | MR_RES_ASPHYX | MR_RES_ACID | MR_RES_STICKY_FLAME + mrd(MR_RES_ELEC | MR_RES_POISON | MR_RES_FIRE | MR_RES_HELLFIRE + | MR_RES_COLD | MR_RES_ASPHYX | MR_RES_ACID | MR_RES_STICKY_FLAME | MR_RES_STEAM, 127), 0, 15, MONS_TEST_SPAWNER, MONS_TEST_SPAWNER, MH_NONLIVING, MAG_IMMUNE, { AT_NO_ATK, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK }, |