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

Added kwargs to resolve_attack

Browse source 
Lets you pass values for attack and defense rolls, making it easier to test and extend.
This commit is contained in:
BattleJenkins 2017-04-07 11:56:26 -07:00 • committed by Griatch
parent 822a17ba63
commit 32dbe4b396
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/contrib/turnbattle.py
View file

@ -161,7 +161,7 @@ def apply_damage(defender, damage):
if defender.db.hp <= 0: if defender.db.hp <= 0:
defender.db.hp = 0 defender.db.hp = 0
def resolve_attack(attacker, defender): def resolve_attack(attacker, defender, attack_value=None, defense_value=None):
""" """
Resolves an attack and outputs the result. Resolves an attack and outputs the result.
@ -175,8 +175,10 @@ def resolve_attack(attacker, defender):
so that they are easier to expand upon. so that they are easier to expand upon.
""" """
# Get an attack roll from the attacker. # Get an attack roll from the attacker.
if not attack_value:
attack_value = get_attack(attacker, defender) attack_value = get_attack(attacker, defender)
# Get a defense value from the defender. # Get a defense value from the defender.
if not defense_value:
defense_value = get_defense(attacker, defender) defense_value = get_defense(attacker, defender)
# If the attack value is lower than the defense value, miss. Otherwise, hit. # If the attack value is lower than the defense value, miss. Otherwise, hit.
if attack_value < defense_value: if attack_value < defense_value: