Skip to content

Fix a crash relating to running out of action points #202

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix a crash relating to running out of action points #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions pokete_classes/fightmap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,27 +341,28 @@ def fight(self, providers):
j.readd()
while True:
player = providers[index % 2]
enem = providers[(index + 1) % 2]
enemy = providers[(index + 1) % 2]

attack = player.get_attack(self, enem)
attack = player.get_attack(self, enemy)
time.sleep(0.3)
if attack == "won":
return player
elif attack != "":
player.curr.attack(attack, enem.curr, self, weather)
player.curr.attack(attack, enemy.curr, self, weather)
self.show()
time.sleep(0.5)
winner = None
loser = None
if all(i.ap == 0 for i in player.curr.attack_obs):
winner = enemy
loser = player
time.sleep(2)
self.outp.outp(f"{player.curr.ext_name} has used all its attacks!")
time.sleep(3)
for i, prov in enumerate(providers):
if prov.curr.hp <= 0:
loser = prov
winner = providers[(i + 1) % 2]
if all(i.ap == 0 for i in player.curr.attack_obs):
winner = providers[(index + 1) % 2]
time.sleep(2)
self.outp.outp(f"{player.curr.ext_name} has used all its' attacks!")
time.sleep(3)
if winner is not None:
if (
loser.curr.player
Expand Down