summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/xom.cc
diff options
context:
space:
mode:
authordolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-20 01:02:43 +0000
committerdolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573>2009-03-20 01:02:43 +0000
commit09df3fcb005f1164e5e0a813cd9dceae4f75dd93 (patch)
tree9724eb9c1968d6013eee56340982ffe2c8549119 /crawl-ref/source/xom.cc
parenta56eea02ae7ce566af2baff5be396ddc15134735 (diff)
downloadcrawl-ref-09df3fcb005f1164e5e0a813cd9dceae4f75dd93.tar.gz
crawl-ref-09df3fcb005f1164e5e0a813cd9dceae4f75dd93.zip
Add a few more Xom messages. Also, since he already has a mass
confusion effect, replace Mass Confusion with Cause Fear in his random spell list. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9520 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/xom.cc')
-rw-r--r--crawl-ref/source/xom.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc
index cf485d99b9..39bd660f72 100644
--- a/crawl-ref/source/xom.cc
+++ b/crawl-ref/source/xom.cc
@@ -58,7 +58,7 @@ REVISION("$Rev$");
static const spell_type _xom_spells[] =
{
SPELL_BLINK, SPELL_CONFUSING_TOUCH, SPELL_MAGIC_MAPPING,
- SPELL_DETECT_ITEMS, SPELL_DETECT_CREATURES, SPELL_MASS_CONFUSION,
+ SPELL_DETECT_ITEMS, SPELL_DETECT_CREATURES, SPELL_CAUSE_FEAR,
SPELL_MASS_SLEEP, SPELL_DISPERSAL, SPELL_STONESKIN, SPELL_RING_OF_FLAMES,
SPELL_OLGREBS_TOXIC_RADIANCE, SPELL_TUKIMAS_VORPAL_BLADE,
SPELL_MAXWELLS_SILVER_HAMMER, SPELL_FIRE_BRAND, SPELL_FREEZING_AURA,
@@ -792,7 +792,6 @@ static bool _xom_confuse_monsters(int sever)
return (rc);
}
-
static bool _xom_send_allies(int sever)
{
bool rc = false;
@@ -967,8 +966,8 @@ static bool _xom_rearrange_pieces(int sever)
// Every now and then, Xom also confuses them all.
const bool confusem = one_chance_in(10);
- // Not just every monster in sight - oh no. Every monster on
- // this level!
+ // Not just every monster in sight - oh no. Every monster on this
+ // level!
for (unsigned i = 0; i < MAX_MONSTERS; ++i)
{
monsters* monster = &menv[i];
@@ -997,8 +996,8 @@ static bool _xom_rearrange_pieces(int sever)
}
}
- // If Xom blinked at least one monster, blink the player,
- // too, and then consider this act done.
+ // If Xom blinked at least one monster, blink the player, too, and
+ // then consider this act done.
if (rc)
random_blink(false);
@@ -1163,9 +1162,9 @@ static bool _xom_is_good(int sever, int tension)
done = _xom_rearrange_pieces(sever);
else if (x_chance_in_y(11, sever) && (you.level_type != LEVEL_ABYSS))
{
- // The Xom teleportation train takes you on instant teleportation to
- // a few random areas, stopping randomly but most likely in an area
- // that is not dangerous to you.
+ // The Xom teleportation train takes you on instant teleportation
+ // to a few random areas, stopping randomly but most likely in
+ // an area that is not dangerous to you.
god_speaks(GOD_XOM, _get_xom_speech("teleportation journey").c_str());
do
{