From ef59a5ee11d63f673da3860e68ec9fcc1fde42ab Mon Sep 17 00:00:00 2001
From: Exempt-Medic <60412657+Exempt-Medic@users.noreply.github.com>
Date: Thu, 4 Sep 2025 19:04:21 -0400
Subject: [PATCH] TUNIC: Change non_local_items Earlier (#5249)

---
 worlds/tunic/__init__.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/worlds/tunic/__init__.py b/worlds/tunic/__init__.py
index db0357daaf..9fca0a7d59 100644
--- a/worlds/tunic/__init__.py
+++ b/worlds/tunic/__init__.py
@@ -208,6 +208,10 @@ class TunicWorld(World):
             else:
                 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.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. "
@@ -477,9 +481,6 @@ class TunicWorld(World):
         self.fill_items = []
         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
-            # 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] = []
             non_filler: list[TunicItem] = []
             for tunic_item in tunic_items: