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

TUNIC: Change non_local_items Earlier (#5249)

Browse Source
This commit is contained in:
Exempt-Medic
2025-09-04 19:04:21 -04:00
committed by GitHub
parent b0b3e3668f
commit ef59a5ee11
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
worlds/tunic/__init__.py
View File

@@ -208,6 +208,10 @@ class TunicWorld(World):
else: else:
self.options.local_fill.value = 0 self.options.local_fill.value = 0
if self.options.local_fill > 0 and self.settings.limit_grass_rando:
# discard grass from non_local if it's meant to be limited
self.options.non_local_items.value.discard("Grass")
if self.options.grass_randomizer: if self.options.grass_randomizer:
if self.settings.limit_grass_rando and self.options.local_fill < 95 and self.multiworld.players > 1: if self.settings.limit_grass_rando and self.options.local_fill < 95 and self.multiworld.players > 1:
raise OptionError(f"TUNIC: Player {self.player_name} has their Local Fill option set too low. " raise OptionError(f"TUNIC: Player {self.player_name} has their Local Fill option set too low. "
@@ -477,9 +481,6 @@ class TunicWorld(World):
self.fill_items = [] self.fill_items = []
if self.options.local_fill > 0 and self.multiworld.players > 1: if self.options.local_fill > 0 and self.multiworld.players > 1:
# skip items marked local or non-local, let fill deal with them in its own way # skip items marked local or non-local, let fill deal with them in its own way
# discard grass from non_local if it's meant to be limited
if self.settings.limit_grass_rando:
self.options.non_local_items.value.discard("Grass")
all_filler: list[TunicItem] = [] all_filler: list[TunicItem] = []
non_filler: list[TunicItem] = [] non_filler: list[TunicItem] = []
for tunic_item in tunic_items: for tunic_item in tunic_items: