diff options
Diffstat (limited to 'crawl-ref')
| -rw-r--r-- | crawl-ref/source/describe.cc | 19 | ||||
| -rw-r--r-- | crawl-ref/source/religion.cc | 8 |
2 files changed, 10 insertions, 17 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index af1598b224..ab6e6bf663 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -2362,31 +2362,26 @@ std::string describe_favour(god_type which_god) static std::string religion_help( god_type god ) { std::string result = ""; - + switch(god) { case GOD_ZIN: result += "Pray at one of " + god_name(god) + "'s altars to part with your money."; break; - - case GOD_SHINING_ONE: - if (!player_under_penance() && you.piety > 160 - && !you.num_gifts[god]) - { - result += "You can pray at an altar to ask " + god_name(god) - + " to bless a long sword."; - } - break; + case GOD_SHINING_ONE: case GOD_LUGONU: if (!player_under_penance() && you.piety > 160 && !you.num_gifts[god]) { result += "You can pray at an altar to ask " + god_name(god) + " to bless your weapon." EOL; - } // fall through - + } + if (god == GOD_SHINING_ONE) + break; + // fall through + case GOD_OKAWARU: case GOD_MAKHLEB: case GOD_BEOGH: diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc index a7e5365fc6..423380b213 100644 --- a/crawl-ref/source/religion.cc +++ b/crawl-ref/source/religion.cc @@ -4168,7 +4168,7 @@ static void _print_sacrifice_message(god_type god, const item_def &item, } _replace(msg, "<>", tag_start); _replace(msg, "</>", tag_end); - + msg.insert(0, item.name(DESC_CAP_THE)); formatted_message_history(msg, MSGCH_GOD); } @@ -4191,11 +4191,9 @@ void altar_prayer() { const int wpn = get_player_wielded_weapon(); - if (wpn != -1 - && weapon_skill( you.inv[wpn] ) == SK_LONG_BLADES - && get_weapon_brand( you.inv[wpn] ) != SPWPN_HOLY_WRATH) + if (wpn != -1 && get_weapon_brand(you.inv[wpn]) != SPWPN_HOLY_WRATH) { - if (bless_weapon( GOD_SHINING_ONE, SPWPN_HOLY_WRATH, YELLOW )) + if (bless_weapon(GOD_SHINING_ONE, SPWPN_HOLY_WRATH, YELLOW)) { // convert those demon blades if blessed: if (you.inv[wpn].sub_type == WPN_DEMON_BLADE) |