Skip to content
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

Fill: Crash if there are remaining unfilled locations #2830

Merged
merged 12 commits into from
Jan 13, 2025
Merged

Fill: Crash if there are remaining unfilled locations #2830

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9b773dc
Fill: crash if we have unfilled locations
alwaysintreble Feb 16, 2024
5468de0
Merge branch 'refs/heads/main' into unfilled_locs_crash
alwaysintreble Apr 23, 2024
1d9298b
if the counts are different per player, log those
alwaysintreble May 18, 2024
1191c8d
only raise for unfilled locations if there are actually more locs tha…
alwaysintreble Jul 9, 2024
01e41ff
Merge branch 'refs/heads/main' into unfilled_locs_crash
alwaysintreble Jul 10, 2024
3b41124
only do the subtraction once
alwaysintreble Jul 10, 2024
ae35da5
reduce nesting by a level
alwaysintreble Jul 10, 2024
be9ba8a
Merge branch 'refs/heads/main' into unfilled_locs_crash
alwaysintreble Jan 5, 2025
e0d173b
make two separate diff counters because counter - counter doesn't cre…
alwaysintreble Jan 5, 2025
e4c6f67
change the logging for more locations to error instead of warning sin…
alwaysintreble Jan 5, 2025
19a3366
Update Fill.py
alwaysintreble Jan 6, 2025
80c9925
Merge branch 'main' into unfilled_locs_crash
Exempt-Medic Jan 13, 2025
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
2 changes: 2 additions & 0 deletions Fill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ def mark_for_locking(location: Location):
locations_counter.update(location.player for location in unfilled)
print_data = {"items": items_counter, "locations": locations_counter}
logging.info(f'Per-Player counts: {print_data})')
if unfilled:
raise FillError(f"Not enough items to fill all locations.")


def flood_items(multiworld: MultiWorld) -> None:
Expand Down
Loading