Trunk->0.3 merge: (2521, 2536, 2538) randart contamination fix, Lugonu greeting, character dump time output fix.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.3@2530 c06c8d41-db1a-0410-9941-cceddc491573

5 files changed, 36 insertions, 15 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index ab01af2387..1d6fabeaf1 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -332,7 +332,7 @@ pickup_thrown = true
         you're fighting, or use safe_autopickup=true.
 
 pickup_dropped = false
-        Pickup_dropped lets autopickup affect objects you've dropped. Set to 
+        pickup_dropped lets autopickup affect objects you've dropped. Set to 
         false to block autopickup for dropped objects. This can be convenient.
 
 assign_item_slot = (forward | backward)
@@ -1014,9 +1014,9 @@ show_turns = false
 
 show_beam = false
         When performing actions such as throwing or zapping, you can toggle 
-	whether to show the beam path or not. This option controls the 
-	initial status of this toggle. When set to true, the path will be 
-	shown.
+        whether to show the beam path or not. This option controls the 
+	    initial status of this toggle. When set to true, the path will be 
+    	shown.
 
 item_stack_summary_minimum = 5
         If you step over a stack with this number or more of items in it,
@@ -1202,12 +1202,18 @@ dump_item_origin_price = 100
 dump_message_count = 7
         The number of last messages to be displayed in character dump files. 
 
-dump_order  = header,hiscore,stats,misc,notes,inventory,turns_by_place,
+dump_order  = header,hiscore,stats,misc,notes,inventory,
 dump_order += skills,spells,overview,mutations,messages,screenshot
-dump_order += kills_by_place,,kills
+dump_order += kills
         Controls the order of sections in the dump. You can use multiple
         dump_order lines - all lines but the first must use dump_order +=
 
+        Two optional dump sections are turns_by_place and kills_by_place,
+        which add detailed statistics to where turns were spent and monsters
+        were killed. You can add them to your dump as:
+
+             dump_order += turns_by_place, kills_by_place
+        
 
 5-b     Notes.
 --------------
@@ -1449,8 +1455,8 @@ mon_glyph = <monster name or symbol> : <colour> <glyph>
         (The left hand side of the : is case-sensitive.)
         
         You can specify symbols using their code points using the
-        syntax as shown in feature. If you're using char_set=unicode,
-        you can use unicode code points:
+        syntax as shown in the "feature" option. If you're using
+        char_set=unicode, you can use unicode code points:
         
         mon_glyph = draconian scorcher : x6e9
 
diff --git a/crawl-ref/source/acr.cc b/crawl-ref/source/acr.cc
index 12234d874e..71dffbff5d 100644
--- a/crawl-ref/source/acr.cc
+++ b/crawl-ref/source/acr.cc
@@ -303,6 +303,9 @@ int main( int argc, char *argv[] )
         case GOD_ELYVILON:
             simple_god_message( " says: Go forth and aid the weak!" );
             break;
+        case GOD_LUGONU:
+            simple_god_message( " says: Spread carnage and corruption!");
+            break;
         case GOD_BEOGH:
             simple_god_message(
                 " says: Drown the unbelievers in a sea of blood!");
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 6eb8de2cda..5c363802ed 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -754,9 +754,9 @@ void game_options::reset_options()
     extra_levels.clear();
     
     dump_order.clear();
-    new_dump_fields("header,hiscore,stats,misc,turns_by_place,inventory,"
+    new_dump_fields("header,hiscore,stats,misc,inventory,"
                     "skills,spells,overview,mutations,messages,screenshot,"
-                    "kills_by_place,kills,notes");
+                    "kills,notes");
 
     hp_colour.clear();
     hp_colour.push_back(std::pair<int,int>(100, LIGHTGREY));
diff --git a/crawl-ref/source/items.cc b/crawl-ref/source/items.cc
index 7a1e980a98..ea3045437f 100644
--- a/crawl-ref/source/items.cc
+++ b/crawl-ref/source/items.cc
@@ -2386,12 +2386,24 @@ void handle_time( long time_delta )
     if (you.duration[DUR_INVIS] && random2(10) < 6)
         added_contamination++;
 
-    if (you.duration[DUR_HASTE] && !you.duration[DUR_BERSERKER] && random2(10) < 6)
+    if (you.duration[DUR_HASTE] && !you.duration[DUR_BERSERKER]
+        && random2(10) < 6)
+    {
         added_contamination++;
+    }
 
-    // randarts are usually about 20x worse than running around invisible
-    // or hasted.. this seems OK.
-    added_contamination += random2(1 + scan_randarts(RAP_MUTAGENIC));
+    if (const int randart_glow = scan_randarts(RAP_MUTAGENIC))
+    {
+        // Reduced randart glow. Note that one randart will contribute
+        // 2 - 5 units of glow to randart_glow. A randart with a mutagen
+        // index of 2 does about 0.58 points of contamination per turn.
+        // A randart with a mutagen index of 5 does about 0.7 points of
+        // contamination per turn.
+        
+        const int mean_glow   = 500 + randart_glow * 40;
+        const int actual_glow = mean_glow / 2 + random2(mean_glow);
+        added_contamination += div_rand_round(actual_glow, 1000);
+    }
 
     // we take off about .5 points per turn
     if (!you.duration[DUR_INVIS] && !you.duration[DUR_HASTE] && coinflip())
diff --git a/crawl-ref/source/output.cc b/crawl-ref/source/output.cc
index c7e6d47fe5..22d3deb2a0 100644
--- a/crawl-ref/source/output.cc
+++ b/crawl-ref/source/output.cc
@@ -823,7 +823,7 @@ std::vector<formatted_string> get_full_detail(bool calc_unid, long sc)
         snprintf(buf, sizeof buf,
                  "Play time  : %10s\n"
                  "Turns      : %10ld\n",
-                 make_time_string(curr).c_str(), you.num_turns );
+                 make_time_string(curr, true).c_str(), you.num_turns );
         cols.add_formatted(0, buf, true);
     }