surprise no card bug fixed
This commit is contained in:
parent
84747dc6a9
commit
3d5819ae67
25
card.py
25
card.py
@ -45,21 +45,7 @@ def attack(wscur, wsene):
|
|||||||
r.extend(Room.start_turn(wsene, wscur))
|
r.extend(Room.start_turn(wsene, wscur))
|
||||||
cur.attacking = False
|
cur.attacking = False
|
||||||
cur.damage = 0 # reset
|
cur.damage = 0 # reset
|
||||||
"""
|
|
||||||
if choice in ene.hand:
|
|
||||||
if choice in unattackable:
|
|
||||||
skills[choice](cur,ene)
|
|
||||||
ene.remove_card(choice)
|
|
||||||
break
|
|
||||||
elif choice == "0":
|
|
||||||
print("{} 受到{}點傷害".format(ene.name,cur.damage))
|
|
||||||
ene.life -= cur.damage
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
print("{} 受到{}點傷害".format(ene.name,cur.damage))
|
|
||||||
ene.life -= cur.damage
|
|
||||||
cur.attacking = False
|
|
||||||
cur.damage = 0 # reset"""
|
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def defend(wscur,wsene): # cur是用卡方
|
def defend(wscur,wsene): # cur是用卡方
|
||||||
@ -116,9 +102,14 @@ def surprise(wscur,wsene):
|
|||||||
cur.status = Room.NOTHING
|
cur.status = Room.NOTHING
|
||||||
ene.status = Room.DEFENCE
|
ene.status = Room.DEFENCE
|
||||||
else:
|
else:
|
||||||
|
msg = "surNoCard"
|
||||||
|
if ene.hand:
|
||||||
|
drop = random.choice(ene.hand)
|
||||||
|
ene.remove_card(drop)
|
||||||
|
msg = "surprised"
|
||||||
r.append(( (wsene, wscur),
|
r.append(( (wsene, wscur),
|
||||||
dumps({"msg": "surprised", "data": [ene.name, cur.damage]})
|
dumps({"msg": msg, "data": [ene.name, cur.damage]})
|
||||||
))
|
))
|
||||||
|
|
||||||
cur.status = Room.NOTHING
|
cur.status = Room.NOTHING
|
||||||
ene.life -= cur.damage
|
ene.life -= cur.damage
|
||||||
|
Loading…
x
Reference in New Issue
Block a user