From 0d5686509dbc178a5647a3dcc62243637ee5e140 Mon Sep 17 00:00:00 2001 From: wr34k Date: Tue, 3 Jul 2018 12:46:25 +0200 Subject: [PATCH] Less shitty cond --- IRCUFC/fight.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/IRCUFC/fight.py b/IRCUFC/fight.py index 0c4324e..6b01a93 100644 --- a/IRCUFC/fight.py +++ b/IRCUFC/fight.py @@ -190,13 +190,14 @@ class Fight(object): # self.IRC.log.info("{} rolled {} and {} rolled {}".format(self.fighters[0].nick, roll1, self.fighters[1].nick, roll2)) - if attacker.nextAction[0] == 'block' and defender.nextAction[0] != 'block': + if attacker.nextAction[0] == 'block' and defender.nextAction[0] == 'block': + self.shout("Both fighters are trying to block at the same time, resulting in a completely retarded action...") + return + + elif attacker.nextAction[0] == 'block': tmp = attacker attacker = defender defender = tmp - elif attacker.nextAction[0] == 'block' and defender.nextAction[0] == 'block': - self.shout("Both fighters are trying to block at the same time, resulting in a completely retarded action...") - return attacker.advantage = True defender.advantage = False