Gozag ability tweaks and interface improvements.

This commit has the following effects, which are sufficiently interconnected
that separating this into multiple commits seemed hard:
* Don't allow players to invoke potion petition unless they have enough gold
  for the guaranteed porridge/blood potion.
* Don't allow players to invoke call merchant unless they have enough gold
  to pay for any shop that might be offered.
* Tweak the formula for shop prices; now it really doesn't depend on the
  shop type at all, and the maximum price will always be a nice round number.
* Display gold requirements in the ability screen. These numbers are slightly
  misleading because the actual gold cost for potion petition or call merchant
  will be a bit different from the displayed cost, but these numbers give the
  player a way to tell whether an ability can be used without committing to
  using it.

1 files changed, 1 insertions, 10 deletions

diff --git a/crawl-ref/source/player-equip.cc b/crawl-ref/source/player-equip.cc
index ac505c28ee..c41427481d 100644
--- a/crawl-ref/source/player-equip.cc
+++ b/crawl-ref/source/player-equip.cc
@@ -1103,16 +1103,7 @@ static void _remove_amulet_of_faith(item_def &item)
         if (you_worship(GOD_GOZAG))
         {
             const int potion_increment = 2;
-            const int shop_increment =
-                GOZAG_SHOP_BASE_MULTIPLIER
-                + GOZAG_SHOP_MOD_MULTIPLIER*you.attribute[ATTR_GOZAG_SHOPS]
-                    >= 100
-                ? 0
-                : min(2, (100
-                          - GOZAG_SHOP_BASE_MULTIPLIER
-                          - GOZAG_SHOP_MOD_MULTIPLIER
-                            *you.attribute[ATTR_GOZAG_SHOPS])
-                          / GOZAG_SHOP_MOD_MULTIPLIER);
+            const int shop_increment = 2;
 
             // XXX: this isn't a 100% match for the list generation; in
             // particular it does not take into account the presence/absence