summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/mon-data.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-24 07:48:59 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-07-24 07:48:59 +0000
commite69a246bd7ed1b77a136b3c1401233a0cfa3f260 (patch)
tree63e7eefd7ef0db71b4fa3edff1fc51ed6096b857 /crawl-ref/source/mon-data.h
parent3f1477cd578fd1e5e1931351c8ea1b9ad18d4a5c (diff)
downloadcrawl-ref-e69a246bd7ed1b77a136b3c1401233a0cfa3f260.tar.gz
crawl-ref-e69a246bd7ed1b77a136b3c1401233a0cfa3f260.zip
Apply r6596, r6622 to 0.4.
Fix lava creatures' resistances. Update change log. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.4@6667 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/mon-data.h')
-rw-r--r--crawl-ref/source/mon-data.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index 56cc5c8da0..61a4a97b7a 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -2914,7 +2914,7 @@
{
MONS_LAVA_WORM, 'w', RED, "lava worm",
M_NO_FLAGS,
- MR_RES_FIRE | MR_VUL_COLD,
+ mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
0, 10, MONS_LAVA_WORM, MONS_LAVA_WORM, MH_NATURAL, -3,
{ {AT_BITE, AF_FIRE, 15}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 6, 3, 5, 0 },
@@ -2925,7 +2925,7 @@
{
MONS_LAVA_FISH, ';', RED, "lava fish",
M_WARM_BLOOD,
- MR_RES_FIRE | MR_VUL_COLD,
+ mrd(MR_RES_FIRE, 3) | MR_VUL_COLD,
0, 10, MONS_BIG_FISH, MONS_LAVA_FISH, MH_NATURAL, -3,
{ {AT_BITE, AF_FIRE, 10}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 4, 3, 5, 0 },