Trunk->0.3 merge (2600-2601): trowel tweak, staff of energy fix.

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

6 files changed, 9 insertions, 17 deletions

diff --git a/crawl-ref/docs/crawl_options.txt b/crawl-ref/docs/crawl_options.txt
index 2072654cfa..63e9f0eefe 100644
--- a/crawl-ref/docs/crawl_options.txt
+++ b/crawl-ref/docs/crawl_options.txt
@@ -83,8 +83,8 @@ The contents of this text are:
 6-  Miscellaneous.
 6-a     All OS.
                 macro_meta_entry, mouse_input, wiz_mode, colours,
-                char_set, cset_ascii, cset_ibm, cset_dec, feature,
-                mon_glyph, classic_item_colours
+                char_set, cset_ascii, cset_ibm, cset_dec, cset_unicode,
+                feature, mon_glyph, classic_item_colours
 6-b     DOS and Windows.
                 dos_use_background_intensity
 6-c     Unix
diff --git a/crawl-ref/init.txt b/crawl-ref/init.txt
index efe63ad663..ae1daa66d1 100644
--- a/crawl-ref/init.txt
+++ b/crawl-ref/init.txt
@@ -272,7 +272,8 @@ message_colour = lightcyan:LOW MAGIC WARNING
 # classic_item_colours = true
 #
 # See crawl_options.txt for the options
-# char_set, cset_ascii, cset_ibm, cset_dec, cset_any, feature, mon_glyph
+# char_set, cset_ascii, cset_ibm, cset_dec, cset_unicode,
+# cset_any, feature, mon_glyph
 
 
 ##### 6-b	DOS and Windows #######################
diff --git a/crawl-ref/source/dat/bazaar.des b/crawl-ref/source/dat/bazaar.des
index c833208cdf..49008bebfc 100644
--- a/crawl-ref/source/dat/bazaar.des
+++ b/crawl-ref/source/dat/bazaar.des
@@ -36,7 +36,7 @@ default-depth: D:10-27
 # Dummy entry
 
 NAME: bzr_entry_dummy
-TAGS: bzr_entry transparent allow_dup
+TAGS: bzr_entry transparent trowel_portal allow_dup
 ORIENT: float
 MARKER: O = lua:bazaar_portal()
 MAP
diff --git a/crawl-ref/source/dat/lab.des b/crawl-ref/source/dat/lab.des
index 0b337f9204..860a3c91fd 100644
--- a/crawl-ref/source/dat/lab.des
+++ b/crawl-ref/source/dat/lab.des
@@ -9,7 +9,7 @@
 # Labyrinth entry vaults
 
 NAME:   lab_entry_generic
-TAGS:   lab_entry transparent allow_dup
+TAGS:   lab_entry transparent trowel_portal allow_dup
 DEPTH:  12-26
 ORIENT: float
 : messager = bell_clock_msg { initmsg="You hear a distant snort." }
diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 3a356cf079..17af073173 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1099,17 +1099,7 @@ static void trowel_card(int power, deck_rarity_type rarity)
     if ( power_level >= 2 )
     {
         // generate a portal to something
-        int mapidx = -1;
-        if ( coinflip() )
-        {
-            // generate a bazaar portal
-            mapidx = find_map_by_name("bzr_entry_dummy");
-        }
-        else
-        {
-            mapidx = find_map_by_name("lab_entry_generic");
-        }
-
+        const int mapidx = random_map_for_tag("trowel_portal", false, false);
         if ( mapidx == -1 )
         {
             mpr("A buggy portal flickers into view, then vanishes.");
diff --git a/crawl-ref/source/spl-cast.cc b/crawl-ref/source/spl-cast.cc
index 88629617eb..51e8d185f7 100644
--- a/crawl-ref/source/spl-cast.cc
+++ b/crawl-ref/source/spl-cast.cc
@@ -661,6 +661,7 @@ bool cast_a_spell()
         return (false);
     }
 
+    const bool staff_energy = player_energy();
     if (you.duration[DUR_CONF])
         random_uselessness( 2 + random2(7), 0 );
     else
@@ -675,7 +676,7 @@ bool cast_a_spell()
     
     dec_mp( spell_mana(spell) );
 
-    if (!player_energy() && you.is_undead != US_UNDEAD)
+    if (!staff_energy && you.is_undead != US_UNDEAD)
     {
         const int spellh = spell_hunger( spell );
         if (spellh > 0)