* Fix Xom's piety wrapping around from 0 -> 255.

* Fix Xom piety 100 (initial state) favouring bad effects.
* Limit tension bonus for good effects to 199.
* Add penalty for tension 0, so bad effects become more likely without
  tension.
* Revert order of Xom's amusement to actually match the amusement gain.
  (Was getting "roars with laughter" for gain of 2, etc.)
* Add damage shaving to Deep Dwarf ghosts.
* Add 'o' to pickup list commands -> stop prompting, start autoexplore.
* Default menu_colour_item_class to true in initfile.cc.
* Allow autopickup of chunks in Lich form.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9634 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 9 insertions, 7 deletions

diff --git a/crawl-ref/source/religion.cc b/crawl-ref/source/religion.cc
index 39ff2b638e..b0bb0dce15 100644
--- a/crawl-ref/source/religion.cc
+++ b/crawl-ref/source/religion.cc
@@ -85,6 +85,7 @@ REVISION("$Rev$");
 #    define DEBUG_PIETY       1
 #endif
 
+#define DEBUG_PIETY 1
 #define PIETY_HYSTERESIS_LIMIT 1
 
 // Item offering messages for the gods:
@@ -2670,7 +2671,9 @@ bool did_god_conduct(conduct_type thing_done, int level, bool known,
                 // Holy gods are easier to please this way
                 if (random2(level + 18 - (is_good_god(you.religion) ? 0 :
                                           you.experience_level / 2)) > 3)
+                {
                     piety_change = 1;
+                }
                 break;
 
             default:
@@ -3248,7 +3251,7 @@ static void _dock_piety(int piety_loss, int penance)
                   (piety_loss == 1) ? " a little " :
                   (piety_loss <  5) ? " " :
                   (piety_loss < 10) ? " very "
-                  : " extremely " );
+                                    : " extremely " );
         }
 
         last_piety_lecture = you.num_turns;
@@ -5393,8 +5396,7 @@ static bool _yred_slaves_abandon_you()
     int num_slaves = 0;
 
     if (you.religion != GOD_YREDELEMNUL)
-        reclaim =
-            apply_to_all_dungeons(_yred_slaves_on_level_abandon_you);
+        reclaim = apply_to_all_dungeons(_yred_slaves_on_level_abandon_you);
     else
     {
         for (radius_iterator ri(you.pos(), 9); ri; ++ri)
@@ -5411,8 +5413,8 @@ static bool _yred_slaves_abandon_you()
                 const int hd = monster->hit_dice;
 
                 // During penance, followers get a saving throw.
-                if (random2((you.piety-you.penance[GOD_YREDELEMNUL])/18) +
-                    random2(you.skills[SK_INVOCATIONS]-6)
+                if (random2((you.piety - you.penance[GOD_YREDELEMNUL])/18)
+                    + random2(you.skills[SK_INVOCATIONS]-6)
                     > random2(hd) + hd + random2(5))
                 {
                     continue;
@@ -5495,8 +5497,8 @@ static bool _beogh_followers_abandon_you()
                     const int hd = monster->hit_dice;
 
                     // During penance, followers get a saving throw.
-                    if (random2((you.piety-you.penance[GOD_BEOGH])/18) +
-                        random2(you.skills[SK_INVOCATIONS]-6)
+                    if (random2((you.piety - you.penance[GOD_BEOGH])/18)
+                        + random2(you.skills[SK_INVOCATIONS]-6)
                         > random2(hd) + hd + random2(5))
                     {
                         continue;