summaryrefslogtreecommitdiffstats
path: root/crawl-ref
diff options
context:
space:
mode:
Diffstat (limited to 'crawl-ref')
-rw-r--r--crawl-ref/source/ghost.cc5
-rw-r--r--crawl-ref/source/mon-data.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 98c60faa02..93ca2be4b2 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -613,7 +613,10 @@ void ghost_demon::init_dancing_weapon(const item_def& weapon, int power)
if (power > 150)
power = 150;
- reset();
+ resists.poison = 1;
+ resists.fire = 1;
+ resists.cold = 1;
+ resists.elec = 1;
colour = weapon.colour;
fly = FL_LEVITATE;
diff --git a/crawl-ref/source/mon-data.h b/crawl-ref/source/mon-data.h
index f2ce0349cf..ae37b3fe68 100644
--- a/crawl-ref/source/mon-data.h
+++ b/crawl-ref/source/mon-data.h
@@ -3528,7 +3528,7 @@ static monsterentry mondata[] = {
{
MONS_DANCING_WEAPON, '(', BLACK, "dancing weapon",
M_FIGHTER,
- mrd(MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD, 1) | MR_RES_ELEC,
+ MR_RES_POISON | MR_RES_FIRE | MR_RES_COLD | MR_RES_ELEC,
0, 10, MONS_DANCING_WEAPON, MONS_DANCING_WEAPON, MH_NONLIVING, MAG_IMMUNE,
{ {AT_HIT, AF_PLAIN, 30}, AT_NO_ATK, AT_NO_ATK, AT_NO_ATK },
{ 15, 0, 0, 15 },