Merged r2784 (batform removal from Metamorphosis)

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

1 files changed, 3 insertions, 6 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index ddc8f3829f..fcb769181d 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -897,14 +897,11 @@ static void metamorphosis_card(int power, deck_rarity_type rarity)
     const int power_level = get_power_level(power, rarity);
     transformation_type trans;
     if ( power_level >= 2 )
-        trans = (coinflip() ? TRAN_DRAGON : TRAN_LICH);
+        trans = coinflip() ? TRAN_DRAGON : TRAN_LICH;
     else if ( power_level == 1 )
-    {
-        trans = (one_chance_in(3) ? TRAN_STATUE :
-                 (coinflip() ? TRAN_ICE_BEAST : TRAN_BLADE_HANDS));
-    }
+        trans = coinflip() ? TRAN_STATUE : TRAN_BLADE_HANDS;
     else
-        trans = (coinflip() ? TRAN_SPIDER : TRAN_BAT);
+        trans = coinflip() ? TRAN_SPIDER : TRAN_ICE_BEAST;
     transform(random2(power/4), trans);
 }