a91082900/ElegyOfDisaster
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

card logic modified; rob bug fixed

Browse Source
This commit is contained in:
Jerry Wu 2018-06-02 16:00:05 +08:00
parent f12fdfd4f7
commit ab3fcedad2
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
game.py
View File

@ -33,7 +33,9 @@ class Player:
def remove_card(self,id): def remove_card(self,id):
self.hand.remove(id) self.hand.remove(id)
self.deck.append(id)
def rob(self, id):
self.hand.append(id)
def robbed(self,id): # be robbed def robbed(self,id): # be robbed
try: try:

4
room.py
View File

@ -161,7 +161,7 @@ class Room:
message_to_send.append(((wsene, ), dumps({"action": "toBeRobbed"}))) message_to_send.append(((wsene, ), dumps({"action": "toBeRobbed"})))
else: else:
ene.robbed(swag) ene.robbed(swag)
cur.add_card(swag) cur.rob(swag)
message_to_send.append(( (wscur,wsene), dumps({"msg": "robbed", "data": [cur.name, cur.robbing]}))) message_to_send.append(( (wscur,wsene), dumps({"msg": "robbed", "data": [cur.name, cur.robbing]})))
cur.robbing = "0" cur.robbing = "0"
@ -183,7 +183,7 @@ class Room:
else: else:
message_to_send.append(( (wscur,wsene), dumps({"msg": "robbed", "data": [ene.name, ene.robbing]}))) message_to_send.append(( (wscur,wsene), dumps({"msg": "robbed", "data": [ene.name, ene.robbing]})))
cur.robbed(ene.robbing) cur.robbed(ene.robbing)
ene.add_card(ene.robbing) ene.rob(ene.robbing)
ene.robbing = "0" ene.robbing = "0"