From ab3fcedad296413270c83c07a6f889a830cad588 Mon Sep 17 00:00:00 2001
From: Jerry Wu <a91082900@gmail.com>
Date: Sat, 2 Jun 2018 16:00:05 +0800
Subject: [PATCH] card logic modified; rob bug fixed

---
 game.py | 4 +++-
 room.py | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/game.py b/game.py
index a024801..d46d02d 100644
--- a/game.py
+++ b/game.py
@@ -33,7 +33,9 @@ class Player:
 
     def remove_card(self,id):
         self.hand.remove(id)
-        self.deck.append(id)
+    
+    def rob(self, id):
+        self.hand.append(id)
 
     def robbed(self,id): # be robbed
         try:
diff --git a/room.py b/room.py
index 51e6f07..524f259 100644
--- a/room.py
+++ b/room.py
@@ -161,7 +161,7 @@ class Room:
                     message_to_send.append(((wsene, ), dumps({"action": "toBeRobbed"})))
                 else:
                     ene.robbed(swag)
-                    cur.add_card(swag)
+                    cur.rob(swag)
                     message_to_send.append(( (wscur,wsene), dumps({"msg": "robbed", "data": [cur.name, cur.robbing]})))
                 
                     cur.robbing = "0"
@@ -183,7 +183,7 @@ class Room:
             else:
                 message_to_send.append(( (wscur,wsene), dumps({"msg": "robbed", "data": [ene.name, ene.robbing]})))
                 cur.robbed(ene.robbing)
-                ene.add_card(ene.robbing)
+                ene.rob(ene.robbing)
             
             ene.robbing = "0"