summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/ghost.cc
diff options
context:
space:
mode:
authorDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-10-06 20:24:03 -0500
committerDavid Lawrence Ramsey <dolorous@users.sourceforge.net>2009-10-06 20:24:03 -0500
commit0e2154d50e2de944bb1495b6ad4a62112ee97f03 (patch)
tree7c9d4dcc2f825c8d07932b6e6de0e64d0f61e9d7 /crawl-ref/source/ghost.cc
parentbfc6dd1f6e86278e0beb739cd45f375367d2dccf (diff)
downloadcrawl-ref-0e2154d50e2de944bb1495b6ad4a62112ee97f03.tar.gz
crawl-ref-0e2154d50e2de944bb1495b6ad4a62112ee97f03.zip
Fix resistances for very ugly things created from leveled-up ugly things
again.
Diffstat (limited to 'crawl-ref/source/ghost.cc')
-rw-r--r--crawl-ref/source/ghost.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/crawl-ref/source/ghost.cc b/crawl-ref/source/ghost.cc
index 7f0cc00132..9912a49690 100644
--- a/crawl-ref/source/ghost.cc
+++ b/crawl-ref/source/ghost.cc
@@ -529,12 +529,12 @@ void ghost_demon::init_ugly_thing(bool very_ugly, bool only_mutate,
// Pick a compatible attack flavour for this colour.
att_flav = _ugly_thing_colour_to_flavour(colour);
+ // Pick a compatible resistance for this attack flavour.
+ ugly_thing_add_resistance(false, att_flav);
+
// If this is a very ugly thing, upgrade it properly.
if (very_ugly)
ugly_thing_to_very_ugly_thing();
-
- // Pick a compatible resistance for this attack flavour.
- ugly_thing_add_resistance(very_ugly, att_flav);
}
void ghost_demon::ugly_thing_to_very_ugly_thing()
@@ -558,6 +558,9 @@ void ghost_demon::ugly_thing_to_very_ugly_thing()
// A very ugly thing sometimes gets an upgraded attack flavour.
att_flav = _very_ugly_thing_flavour_upgrade(att_flav);
+
+ // Pick a compatible resistance for this attack flavour.
+ ugly_thing_add_resistance(true, att_flav);
}
void ghost_demon::ugly_thing_add_resistance(bool very_ugly,