diff options
| author | Chris Campbell <chriscampbell89@gmail.com> | 2014-07-07 07:47:20 +0100 |
|---|---|---|
| committer | Chris Campbell <chriscampbell89@gmail.com> | 2014-07-08 15:12:40 +0100 |
| commit | e7b52e16aab97479806c45da5a5bb0e9e420bef4 (patch) | |
| tree | e63d19b98e6565fc975fa0ea8f7ede3b12895871 /crawl-ref/source/godpassive.cc | |
| parent | 3d4682682ae7821b541829bac35132bfb9ae33b1 (diff) | |
| download | crawl-ref-e7b52e16aab97479806c45da5a5bb0e9e420bef4.tar.gz crawl-ref-e7b52e16aab97479806c45da5a5bb0e9e420bef4.zip | |
Don't consider the finger necklace's ring slot for Ash boundedness
Felids and Octopodes wearing the necklace had the extra ring slot
counted towards their boundedness (but other species didn't).
Diffstat (limited to 'crawl-ref/source/godpassive.cc')
| -rw-r--r-- | crawl-ref/source/godpassive.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/godpassive.cc b/crawl-ref/source/godpassive.cc index 54ee1b214a..bca90752aa 100644 --- a/crawl-ref/source/godpassive.cc +++ b/crawl-ref/source/godpassive.cc @@ -186,10 +186,15 @@ void ash_check_bondage(bool msg) // Octopodes don't count these slots: else if (you.species == SP_OCTOPODE && (i == EQ_LEFT_RING || i == EQ_RIGHT_RING)) + { continue; + } // *Only* octopodes count these slots: else if (you.species != SP_OCTOPODE && i > EQ_AMULET) continue; + // Never count the macabre finger necklace's extra ring slot. + else if (i == EQ_RING_AMULET) + continue; else s = ET_JEWELS; @@ -242,7 +247,7 @@ void ash_check_bondage(bool msg) // kittehs don't obey hoomie rules! if (you.species == SP_FELID) { - for (int i = EQ_LEFT_RING; i < NUM_EQUIP; ++i) + for (int i = EQ_LEFT_RING; i <= EQ_AMULET; ++i) if (you.equip[i] != -1 && you.inv[you.equip[i]].cursed()) ++you.bondage_level; |