diff options
Diffstat (limited to 'battle/summons.py')
| -rw-r--r-- | battle/summons.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/battle/summons.py b/battle/summons.py index ec60b7c..f3009df 100644 --- a/battle/summons.py +++ b/battle/summons.py @@ -24,12 +24,12 @@ from battle.skills import skill_core from battle.common import conditions #from battle.main import advance_wave, battle_endturn, get_result -def handle_summon(token, summon): +def handle_summon(token, summon, summon_id): global Battle, Player try: # Log that summon was used (single action log) - Battle[token]["log"]=[["", 0, SRV_SUMMON, summon["summon_id"], "", 0]] + Battle[token]["log"]=[["", 0, SRV_SUMMON, summon_id, "", 0]] # Summon strength is based on player rank force=summon["strength"]*Player[token]["level"] @@ -64,10 +64,7 @@ def summon(args, token): summon_id=int(ss[0]) # Create summon object - summon=dl_search(allsummons, "summon_id", summon_id) - if summon == "ERROR": - stdout("ERROR, INVALID SUMMON ID %d" % summon_id) - raise Exception("Invalid summon") + summon=allsummons[summon_id] # Verify the cost if Battle[token]["bp"] < summon["cost"]: @@ -89,7 +86,7 @@ def summon(args, token): Battle[token]["bp"]-=summon["cost"] Battle["s"]=1 - return handle_summon(token, summon) + return handle_summon(token, summon, summon_id) ################################################# |