Allow a weapon swap when drawing the Illusion.

Now the player illusion won't be deck bashing if the deck was wielded
and evoked.

1 files changed, 15 insertions, 7 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index f36ab0aee6..2c41ddf075 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -2015,14 +2015,8 @@ static void _helm_card(int power, deck_rarity_type rarity)
     }
 }
 
-static void _blade_card(int power, deck_rarity_type rarity)
+static void _do_weapon_swap()
 {
-    if (you.species == SP_FELID)
-    {
-        mpr("You feel like a smilodon for a moment.");
-        return;
-    }
-
     // Pause before jumping to the list.
     more();
 
@@ -2030,6 +2024,18 @@ static void _blade_card(int power, deck_rarity_type rarity)
     int old_time = you.time_taken;
     wield_weapon(false);
     you.time_taken = old_time;
+}
+
+
+static void _blade_card(int power, deck_rarity_type rarity)
+{
+    if (you.species == SP_FELID)
+    {
+        mpr("You feel like a smilodon for a moment.");
+        return;
+    }
+
+    _do_weapon_swap();
 
     const int power_level = _get_power_level(power, rarity);
     brand_type brand;
@@ -2805,6 +2811,8 @@ static void _illusion_card(int power, deck_rarity_type rarity)
     if (!mon || monster_at(you.pos()))
         return;
 
+    _do_weapon_swap();
+
     mon->type = MONS_PLAYER;
     mon->behaviour = BEH_SEEK;
     mon->attitude = ATT_FRIENDLY;