Fix 1996770: shafts being capable of disarming.

Fix 1996304: the Swap card incorrectly swapping monsters/player caught in a net


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

1 files changed, 31 insertions, 2 deletions

diff --git a/crawl-ref/source/decks.cc b/crawl-ref/source/decks.cc
index 395e2032eb..9a4b1a25d5 100644
--- a/crawl-ref/source/decks.cc
+++ b/crawl-ref/source/decks.cc
@@ -1354,6 +1354,8 @@ static void _swap_monster_card(int power, deck_rarity_type rarity)
     {
         monsters& mon(*mon_to_swap);
         const coord_def newpos = mon.pos();
+        bool mon_caught = mons_is_caught(&mon);
+        bool you_caught = you.attribute[ATTR_HELD];
 
         // Pick the monster up.
         mgrd(newpos) = NON_MONSTER;
@@ -1361,11 +1363,38 @@ static void _swap_monster_card(int power, deck_rarity_type rarity)
         mon.x = you.x_pos;
         mon.y = you.y_pos;
 
-        // plunk it down
+        // Plunk it down
         mgrd(mon.pos()) = monster_index(mon_to_swap);
 
-        // move you to its previous location
+        if (you_caught)
+        {
+            check_net_will_hold_monster(&mon);
+            if (!mon_caught)
+                you.attribute[ATTR_HELD] = 0;
+        }
+
+        // Move you to its previous location.
         you.moveto(newpos);
+
+        if (mon_caught)
+        {
+            if (you.body_size(PSIZE_BODY) >= SIZE_GIANT)
+            {
+                mpr("The net rips apart!");
+                you.attribute[ATTR_HELD] = 0;
+                int net = get_trapping_net(you.x_pos, you.y_pos);
+                if (net != NON_ITEM)
+                    destroy_item(net);
+            }
+            else
+            {
+                you.attribute[ATTR_HELD] = 10;
+                mpr("You become entangled in the net!");
+            }
+
+            if (!you_caught)
+                mon.del_ench(ENCH_HELD, true);
+        }
     }
 }