diff options
author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 18:19:17 +0000 |
---|---|---|
committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-04-18 18:19:17 +0000 |
commit | ae1a7ea0f4e5a268cd780e9234e2a0505446ff7d (patch) | |
tree | f7fb8d4e3c81048e62577ce46c6bb6068185fcb9 /crawl-ref | |
parent | a7203404130a710ead01f0edf8e043524682ca44 (diff) | |
download | crawl-ref-ae1a7ea0f4e5a268cd780e9234e2a0505446ff7d.tar.gz crawl-ref-ae1a7ea0f4e5a268cd780e9234e2a0505446ff7d.zip |
Add more Xom messages, plus some minor cosmetic fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9632 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref')
-rw-r--r-- | crawl-ref/source/dat/database/godspeak.txt | 8 | ||||
-rw-r--r-- | crawl-ref/source/xom.cc | 10 |
2 files changed, 11 insertions, 7 deletions
diff --git a/crawl-ref/source/dat/database/godspeak.txt b/crawl-ref/source/dat/database/godspeak.txt index 573990921c..ae58571dd0 100644 --- a/crawl-ref/source/dat/database/godspeak.txt +++ b/crawl-ref/source/dat/database/godspeak.txt @@ -233,6 +233,8 @@ You hear Xom's maniacal laughter. Xom rearrange the pieces Xom decides to rearrange the pieces. + +"This might be better!" %%%% Xom teleportation journey @@ -247,6 +249,8 @@ Xom twists space around you. Xom confusion "Heh heh heh..." + +Xom titters. %%%% # 25% chance of draining, else torment Xom draining or torment @@ -380,13 +384,13 @@ Xom smiles on you. %%%% Xom repel stairs -Xom alters the dungeon around you. - Xom changes the scenery. Xom pokes at a staircase. "Tag, you're it!" + +Xom alters the dungeon around you. %%%% # Xom laughing # (Currently only used post-game in response to "You die...") diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 652b8fd616..16b18146fa 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1340,8 +1340,8 @@ static bool _swap_monsters(monsters *m1, monsters *m2) } // Swap places with a random monster and, depending on severity, also -// between monsters. This can be pretty bad if there are a lot of hostile -// monsters around. +// between monsters. This can be pretty bad if there are a lot of +// hostile monsters around. static bool _xom_rearrange_pieces(int sever) { if (player_stair_delay()) @@ -1375,11 +1375,11 @@ static bool _xom_rearrange_pieces(int sever) if (one_chance_in(5)) _confuse_monster(*mon, sever); - if (num_mons > 1 && x_chance_in_y(sever,70)) + if (num_mons > 1 && x_chance_in_y(sever, 70)) { bool did_message = false; - const int max_repeats = std::min(num_mons/2, 8); - const int repeats = std::min(random2(sever/10)+1, max_repeats); + const int max_repeats = std::min(num_mons / 2, 8); + const int repeats = std::min(random2(sever / 10) + 1, max_repeats); for (int i = 0; i < repeats; ++i) { const int mon1 = random2(num_mons); |