diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-14 12:01:47 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-05-14 12:01:47 +0000 |
| commit | 4759bd486654762763a6d480f9d911881bbfdabd (patch) | |
| tree | 0902926986fc975943fc8c2da4f3445d4eefcb01 /crawl-ref/source/abl-show.cc | |
| parent | d912b369107ede75db2818bdf7609745f82a2347 (diff) | |
| download | crawl-ref-4759bd486654762763a6d480f9d911881bbfdabd.tar.gz crawl-ref-4759bd486654762763a6d480f9d911881bbfdabd.zip | |
* Fix wielding a quivered weapon not changing the quiver.
* Change Ely ability slots.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9763 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/abl-show.cc')
| -rw-r--r-- | crawl-ref/source/abl-show.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/crawl-ref/source/abl-show.cc b/crawl-ref/source/abl-show.cc index b3f586ae06..1b57c2f05d 100644 --- a/crawl-ref/source/abl-show.cc +++ b/crawl-ref/source/abl-show.cc @@ -135,8 +135,8 @@ ability_type god_abilities[MAX_NUM_GODS][MAX_GOD_ABILITIES] = { ABIL_NEMELEX_DRAW_ONE, ABIL_NEMELEX_PEEK_TWO, ABIL_NEMELEX_TRIPLE_DRAW, ABIL_NEMELEX_MARK_FOUR, ABIL_NEMELEX_STACK_FIVE }, // Elyvilon - { ABIL_ELYVILON_LESSER_HEALING_SELF, ABIL_ELYVILON_PURIFICATION, - ABIL_ELYVILON_GREATER_HEALING_SELF, ABIL_ELYVILON_RESTORATION, + { ABIL_ELYVILON_LESSER_HEALING_OTHERS, ABIL_ELYVILON_PURIFICATION, + ABIL_ELYVILON_GREATER_HEALING_OTHERS, ABIL_ELYVILON_RESTORATION, ABIL_ELYVILON_DIVINE_VIGOUR }, // Lugonu { ABIL_LUGONU_ABYSS_EXIT, ABIL_LUGONU_BEND_SPACE, ABIL_LUGONU_BANISH, @@ -2190,16 +2190,16 @@ std::vector<talent> your_talents(bool check_confused) if (abil != ABIL_NON_ABILITY) { _add_talent(talents, abil, check_confused); - if (abil == ABIL_ELYVILON_LESSER_HEALING_SELF) + if (abil == ABIL_ELYVILON_LESSER_HEALING_OTHERS) { _add_talent(talents, - ABIL_ELYVILON_LESSER_HEALING_OTHERS, + ABIL_ELYVILON_LESSER_HEALING_SELF, check_confused); } - else if (abil == ABIL_ELYVILON_GREATER_HEALING_SELF) + else if (abil == ABIL_ELYVILON_GREATER_HEALING_OTHERS) { _add_talent(talents, - ABIL_ELYVILON_GREATER_HEALING_OTHERS, + ABIL_ELYVILON_GREATER_HEALING_SELF, check_confused); } } @@ -2364,8 +2364,8 @@ void set_god_ability_slots() // Finally, add in current god's invocations in traditional slots. int num = 0; - if (you.religion == GOD_ELYVILON) - _set_god_ability_helper(ABIL_ELYVILON_DESTROY_WEAPONS, 'a' + num++); +// if (you.religion == GOD_ELYVILON) +// _set_god_ability_helper(ABIL_ELYVILON_DESTROY_WEAPONS, 'a' + num++); for (int i = 0; i < MAX_GOD_ABILITIES; ++i) { @@ -2377,15 +2377,15 @@ void set_god_ability_slots() if (you.religion == GOD_ELYVILON) { if (god_abilities[you.religion][i] - == ABIL_ELYVILON_LESSER_HEALING_SELF) + == ABIL_ELYVILON_LESSER_HEALING_OTHERS) { - _set_god_ability_helper(ABIL_ELYVILON_LESSER_HEALING_OTHERS, + _set_god_ability_helper(ABIL_ELYVILON_LESSER_HEALING_SELF, 'a' + num++); } else if (god_abilities[you.religion][i] - == ABIL_ELYVILON_GREATER_HEALING_SELF) + == ABIL_ELYVILON_GREATER_HEALING_OTHERS) { - _set_god_ability_helper(ABIL_ELYVILON_GREATER_HEALING_OTHERS, + _set_god_ability_helper(ABIL_ELYVILON_GREATER_HEALING_SELF, 'a' + num++); } } |