From 1bd85947be78c8a0f5772437a149c1deb3430437 Mon Sep 17 00:00:00 2001
From: Witchybun <elnendil@gmail.com>
Date: Sun, 4 Feb 2024 04:36:41 -0600
Subject: [PATCH] Remove Diamond Wand, Fix Andy's Cellar Logic

---
 worlds/stardew_valley/mods/logic/special_orders_logic.py | 6 ++++--
 worlds/stardew_valley/strings/ap_names/mods/mod_items.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/worlds/stardew_valley/mods/logic/special_orders_logic.py b/worlds/stardew_valley/mods/logic/special_orders_logic.py
index 082ae9719786..e51a23d50254 100644
--- a/worlds/stardew_valley/mods/logic/special_orders_logic.py
+++ b/worlds/stardew_valley/mods/logic/special_orders_logic.py
@@ -8,10 +8,12 @@
 from ...logic.crafting_logic import CraftingLogicMixin
 from ...logic.crop_logic import CropLogicMixin
 from ...logic.has_logic import HasLogicMixin
+from ...logic.received_logic import ReceivedLogicMixin
 from ...logic.region_logic import RegionLogicMixin
 from ...logic.relationship_logic import RelationshipLogicMixin
 from ...logic.season_logic import SeasonLogicMixin
 from ...logic.wallet_logic import WalletLogicMixin
+from ...strings.ap_names.community_upgrade_names import CommunityUpgrade
 from ...strings.artisan_good_names import ArtisanGood
 from ...strings.craftable_names import Consumable, Edible, Bomb
 from ...strings.crop_names import Fruit
@@ -33,7 +35,7 @@ def __init__(self, *args, **kwargs):
 
 
 class ModSpecialOrderLogic(BaseLogic[Union[ActionLogicMixin, ArtisanLogicMixin, CraftingLogicMixin, CropLogicMixin, HasLogicMixin, RegionLogicMixin,
-RelationshipLogicMixin, SeasonLogicMixin, WalletLogicMixin]]):
+ReceivedLogicMixin, RelationshipLogicMixin, SeasonLogicMixin, WalletLogicMixin]]):
     def get_modded_special_orders_rules(self):
         special_orders = {}
         if ModNames.juna in self.options.mods:
@@ -48,7 +50,7 @@ def get_modded_special_orders_rules(self):
         if ModNames.sve in self.options.mods:
             special_orders.update({
                 ModSpecialOrder.andys_cellar: self.logic.has(Material.stone) & self.logic.has(Material.wood) & self.logic.has(Material.hardwood) &
-                                              self.logic.has(MetalBar.iron) &
+                                              self.logic.has(MetalBar.iron) & self.logic.received(CommunityUpgrade.movie_theater, 1) &
                                               self.logic.region.can_reach(SVERegion.fairhaven_farm),
                 ModSpecialOrder.a_mysterious_venture: self.logic.has(Bomb.cherry_bomb) & self.logic.has(Bomb.bomb) & self.logic.has(Bomb.mega_bomb) &
                                                       self.logic.region.can_reach(Region.adventurer_guild),
diff --git a/worlds/stardew_valley/strings/ap_names/mods/mod_items.py b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
index 82064a36b97a..ccc2765544a6 100644
--- a/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
+++ b/worlds/stardew_valley/strings/ap_names/mods/mod_items.py
@@ -26,7 +26,7 @@ class SVEQuestItem:
     grandpa_shed = "Grandpa's Shed"
 
     sve_quest_items: List[str] = [aurora_vineyard_tablet, iridium_bomb, void_soul, kittyfish_spell, scarlett_job_offer, morgan_schooling, grandpa_shed]
-    sve_quest_items_ginger_island: List[str] = [diamond_wand, marlon_boat_paddle, fable_reef_portal]
+    sve_quest_items_ginger_island: List[str] = [marlon_boat_paddle, fable_reef_portal]
 
 
 class SVELocation: