annabunches/4etools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

battleman.py: Avoid getting stuck in input loop when adding conditions or using recharge powers

Browse Source
This commit is contained in:
Anna Rose 2012-03-25 14:08:15 -04:00
parent 14e5033c2d
commit 656e46d28e
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
battleman.py
View File

@ -150,6 +150,10 @@ class Combatant():
def choose_condition(self): def choose_condition(self):
if not len(self.conditions):
print '{} has no conditions.'.format(self)
return None
print self.format_condition_summary() print self.format_condition_summary()
index = input_int('choice') index = input_int('choice')
@ -296,6 +300,10 @@ class Combatant():
def choose_recharge_power(self): def choose_recharge_power(self):
if not len(self.recharges):
print '{} has no rechargable powers.'.format(self)
return None
print self.format_recharge_summary() print self.format_recharge_summary()
index = input_int('choice') index = input_int('choice')
@ -749,9 +757,13 @@ def do_remove_condition(data):
if len(data) >= 2: if len(data) >= 2:
index = int(data[1]) index = int(data[1])
else: else:
index = c.choose_condition()['index'] cond = c.choose_condition()
index = None
if cond:
index = cond['index']
c.remove_condition(index) if index != None:
c.remove_condition(index)
# fixme: if you pick someone with no recharges, you get stuck in a loop # fixme: if you pick someone with no recharges, you get stuck in a loop
@ -767,9 +779,13 @@ def do_use_recharge_power(data):
if len(data) >= 2: if len(data) >= 2:
index = int(data[1]) index = int(data[1])
else: else:
index = c.choose_recharge_power()['index'] r = c.choose_recharge_power()
index = None
if r:
index = r['index']
c.use_recharge_power(index) if index != None:
c.use_recharge_power(index)
def do_wait(data): def do_wait(data):