morgan/Grinch-AP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merging conflicts

Browse Source
This commit is contained in:
Morgan Kelley
2025-11-13 21:24:04 -07:00
parent cf5b3bc916
commit e623555581
2 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
worlds/grinch/__init__.py
View File

@@ -69,12 +69,6 @@ class GrinchWorld(World):
for _ in range(3):
self_itempool.append(self.create_item(item))
<<<<<<< HEAD
#Get number of current unfilled locations
unfilled_locations: int = (
len(self.multiworld.get_unfilled_locations(self.player)) - len(self_itempool)
)
=======
# Get number of current unfilled locations
unfilled_locations: int = (
len(self.multiworld.get_unfilled_locations(self.player)) - len(ALL_ITEMS_TABLE.keys()) - 3
@@ -86,7 +80,6 @@ class GrinchWorld(World):
# This catches the extra 1 or 2 unfilled_locations that come up from the math.floor()
extra_locations = unfilled_locations - (filler_locations + trap_locations)
filler_locations != extra_locations
>>>>>>> 31333183 (Adding weights for filler and traps)
# Total available weight sum
total_fillerweights = sum(self.options.filler_weight[filler] for filler in MISC_ITEMS_TABLE)