Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified bool returns in is_in_combat, is_turn

Browse source
This commit is contained in:
FlutterSprite 2017-10-23 21:16:19 -07:00
parent 6e619d1949
commit 347f161d94
3 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
evennia/contrib/turnbattle/tb_basic.py
View file

@ -239,9 +239,7 @@ def is_in_combat(character):
Returns: Returns:
(bool): True if in combat or False if not in combat (bool): True if in combat or False if not in combat
""" """
if character.db.combat_turnhandler: return bool(character.db.combat_turnhandler)
return True
return False
def is_turn(character): def is_turn(character):
@ -256,9 +254,7 @@ def is_turn(character):
""" """
turnhandler = character.db.combat_turnhandler turnhandler = character.db.combat_turnhandler
currentchar = turnhandler.db.fighters[turnhandler.db.turn] currentchar = turnhandler.db.fighters[turnhandler.db.turn]
if character == currentchar: return bool(character == currentchar)
return True
return False
def spend_action(character, actions, action_name=None): def spend_action(character, actions, action_name=None):

8
evennia/contrib/turnbattle/tb_equip.py
View file

@ -284,9 +284,7 @@ def is_in_combat(character):
Returns: Returns:
(bool): True if in combat or False if not in combat (bool): True if in combat or False if not in combat
""" """
if character.db.combat_turnhandler: return bool(character.db.combat_turnhandler)
return True
return False
def is_turn(character): def is_turn(character):
@ -301,9 +299,7 @@ def is_turn(character):
""" """
turnhandler = character.db.combat_turnhandler turnhandler = character.db.combat_turnhandler
currentchar = turnhandler.db.fighters[turnhandler.db.turn] currentchar = turnhandler.db.fighters[turnhandler.db.turn]
if character == currentchar: return bool(character == currentchar)
return True
return False
def spend_action(character, actions, action_name=None): def spend_action(character, actions, action_name=None):

8
evennia/contrib/turnbattle/tb_range.py
View file

@ -415,9 +415,7 @@ def is_in_combat(character):
Returns: Returns:
(bool): True if in combat or False if not in combat (bool): True if in combat or False if not in combat
""" """
if character.db.combat_turnhandler: return bool(character.db.combat_turnhandler)
return True
return False
def is_turn(character): def is_turn(character):
@ -432,9 +430,7 @@ def is_turn(character):
""" """
turnhandler = character.db.combat_turnhandler turnhandler = character.db.combat_turnhandler
currentchar = turnhandler.db.fighters[turnhandler.db.turn] currentchar = turnhandler.db.fighters[turnhandler.db.turn]
if character == currentchar: return bool(character == currentchar)
return True
return False
def spend_action(character, actions, action_name=None): def spend_action(character, actions, action_name=None):