diff options
| author | Steve Melenchuk <smelenchuk@gmail.com> | 2014-01-26 19:49:31 -0700 |
|---|---|---|
| committer | Steve Melenchuk <smelenchuk@gmail.com> | 2014-01-26 19:49:31 -0700 |
| commit | 94ac2d26976af97045da001c4a8a207a0e301dba (patch) | |
| tree | 792971069ebffa157ade7c70416b93cc02b52452 /crawl-ref/source/xom.cc | |
| parent | fd4a9a875730ec7591b55a21625a9f91aa637084 (diff) | |
| download | crawl-ref-94ac2d26976af97045da001c4a8a207a0e301dba.tar.gz crawl-ref-94ac2d26976af97045da001c4a8a207a0e301dba.zip | |
Chaos champions: Rearrange the Pieces.
This is a close analogue of Xom's "rearrange the pieces" effect, only it
selects pairs of nearby creatures randomly to swap around rather than
swapping you with a nearby target first and then swapping nearby
monsters indiscriminately; every nearby creature here is guaranteed to
be repositioned (unless there are an odd number of creatures in view, in
which case one will be left out). There are also no confusion effects.
Chain of Chaos is now unused; it's been suggested it be used for a Xom
effect, but I'll leave that to others to figure out.
Diffstat (limited to 'crawl-ref/source/xom.cc')
| -rw-r--r-- | crawl-ref/source/xom.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/xom.cc b/crawl-ref/source/xom.cc index 9e652104a1..f59e21a509 100644 --- a/crawl-ref/source/xom.cc +++ b/crawl-ref/source/xom.cc @@ -1342,7 +1342,7 @@ static void _confuse_monster(monster* mons, int sever) } } -static bool _swap_monsters(monster* m1, monster* m2) +bool swap_monsters(monster* m1, monster* m2) { monster& mon1(*m1); monster& mon2(*m2); @@ -1573,7 +1573,7 @@ static int _xom_rearrange_pieces(int sever, bool debug = false) while (mon1 == mon2) mon2 = random2(num_mons); - if (_swap_monsters(mons[mon1], mons[mon2])) + if (swap_monsters(mons[mon1], mons[mon2])) { if (!did_message) { |