Tomb rebalancing.

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

2 files changed, 14 insertions, 12 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 5364ef2d44..bfd196c69d 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2036,7 +2036,7 @@ void card_effect(card_type which_card, deck_rarity_type rarity,
             god_speaks(GOD_XOM, "Xom roars with laughter!");
             you.gift_timeout = 255;
         }
-        else if (you.penance[GOD_XOM] > 0)
+        else if (you.penance[GOD_XOM])
             god_speaks(GOD_XOM, "Xom laughs nastily.");
     }
 
@@ -2066,7 +2066,7 @@ void card_effect(card_type which_card, deck_rarity_type rarity,
     case CARD_GENIE:            genie_card(power, rarity); break;
     case CARD_CURSE:            curse_card(power, rarity); break;
     case CARD_WARPWRIGHT:       warpwright_card(power, rarity); break;
-    case CARD_TOMB:             entomb(power/2); break;
+    case CARD_TOMB:             entomb(power); break;
     case CARD_WRAITH:           drain_exp(); lose_level(); break;
     case CARD_WRATH:            godly_wrath(); break;
     case CARD_SUMMON_DEMON:     summon_demon_card(power, rarity); break;
@@ -2076,7 +2076,8 @@ void card_effect(card_type which_card, deck_rarity_type rarity,
     case CARD_SUMMON_WEAPON:    summon_dancing_weapon(power, rarity); break;
     case CARD_TROWEL:           trowel_card(power, rarity); break;
     case CARD_SPADE: your_spells(SPELL_DIG, random2(power/4), false); break;
-        
+    case CARD_BANSHEE: mass_enchantment(ENCH_FEAR, power, MHITYOU); break;
+
     case CARD_VENOM:
         if ( coinflip() )
             your_spells(SPELL_OLGREBS_TOXIC_RADIANCE,random2(power/4), false);
@@ -2097,15 +2098,12 @@ void card_effect(card_type which_card, deck_rarity_type rarity,
             mpr("The map is blank.");
         break;
 
-    case CARD_BANSHEE: mass_enchantment(ENCH_FEAR, power, MHITYOU); break;
-
     case CARD_WILD_MAGIC:
         // yes, high power is bad here
         miscast_effect( SPTYP_RANDOM, random2(power/15) + 5,
                         random2(power), 0, "a card of wild magic" );
         break;
 
-
     case CARD_FAMINE:
         if (you.is_undead == US_UNDEAD)
             mpr("You feel rather smug.");
@@ -2128,7 +2126,7 @@ void card_effect(card_type which_card, deck_rarity_type rarity,
     if (you.religion == GOD_XOM
         && (which_card == CARD_BLANK1 || which_card == CARD_BLANK2))
     {
-        god_speaks(GOD_XOM, "\"How boring, lets spice things up a little.\"");
+        god_speaks(GOD_XOM, "\"How boring, let's spice things up a little.\"");
 
         xom_acts(abs(you.piety - 100));
     }
diff --git a/crawl-ref/source/spells3.cc b/crawl-ref/source/spells3.cc
index ab408d09bd..f35ae60e35 100644
--- a/crawl-ref/source/spells3.cc
+++ b/crawl-ref/source/spells3.cc
@@ -666,6 +666,10 @@ void you_teleport_now( bool allow_control, bool new_abyss_area )
 
 bool entomb(int powc)
 {
+    // power guidelines:
+    // powc is roughly 50 at Evoc 10 with no godly assistance, ranging
+    // up to 300 or so with godly assistance or end-level, and 1200
+    // as more or less the theoretical maximum.
     int number_built = 0;
 
     const dungeon_feature_type safe_to_overwrite[] = {
@@ -675,10 +679,10 @@ bool entomb(int powc)
         DNGN_FLOOR_SPECIAL
     };
 
-    if ( powc > 95 )
-        powc = 95;
-    if ( powc < 25 )
-        powc = 25;
+    if ( powc > 98 )
+        powc = 98;
+    if ( powc < 30 )
+        powc = 30;
 
     for (int srx = you.x_pos - 1; srx < you.x_pos + 2; srx++)
     {
@@ -691,7 +695,7 @@ bool entomb(int powc)
                 continue;
             }
 
-            if ( random2(100) > powc )
+            if ( one_chance_in(powc/5) )
                 continue;
 
             bool proceed = false;