Skip to content

Fix Multiplayer Battle End Condition - Resolves #355 #375

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

Open
Owenb135 wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Multiplayer Battle End Condition - Resolves #355 #375

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ed3669
Replace infinite loop with conditional fight logic
Owenb135 Jun 9, 2026
69e9d45
Merge pull request #1 from Owenb135/Owenb135-patch-1
Owenb135 Jun 9, 2026
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
13 changes: 9 additions & 4 deletions src/pokete/classes/fight/fight.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,9 @@ def __call__(self, ctx: Context, providers: list[Provider]):
i = prov.curr
for j in i.effects:
j.readd()
while True:

fight_over = False
while not fight_over:
player: Provider = self.providers[index % 2]
enem: Provider = self.providers[(index + 1) % 2]
winner: Provider | None = None
Expand Down Expand Up @@ -142,10 +144,13 @@ def __call__(self, ctx: Context, providers: list[Provider]):
if winner is not None:
if any(p.hp > 0 for p in loser.pokes[:6]):
if not loser.handle_defeat(ctx, self.fightmap, winner):
break
fight_over = True # Set flag to exit outer loop
else:
break
index += 1
fight_over = True # Set flag to exit outer loop

if not fight_over:
index += 1

audio.play("xDeviruchi - Decisive Battle (End).mp3")

xp = (
Expand Down