Merge branch 'main' into tunc-portal-direction-pairing

WebHostLib/templates/weightedOptions/macros.html

@@ -138,7 +138,7 @@
                     id="{{ option_name }}-{{ key }}"
                     name="{{ option_name }}||{{ key }}"
                     value="1"
-                    checked="{{ "checked" if key in option.default else "" }}"
+                    {{ "checked" if key in option.default }}
                 />
                 <label for="{{ option_name }}-{{ key }}">
                     {{ key }}

worlds/stardew_valley/logic/fishing_logic.py

@@ -14,6 +14,7 @@ from ..options import ExcludeGingerIsland
 from ..options import SpecialOrderLocations
 from ..stardew_rule import StardewRule, True_, False_
 from ..strings.ap_names.mods.mod_items import SVEQuestItem
+from ..strings.craftable_names import Fishing
 from ..strings.fish_names import SVEFish
 from ..strings.machine_names import Machine
 from ..strings.quality_names import FishQuality
@@ -74,16 +75,18 @@ class FishingLogic(BaseLogic[Union[HasLogicMixin, FishingLogicMixin, ReceivedLog
     def can_catch_quality_fish(self, fish_quality: str) -> StardewRule:
         if fish_quality == FishQuality.basic:
             return True_()
-        rod_rule = self.logic.tool.has_fishing_rod(2)
         if fish_quality == FishQuality.silver:
-            return rod_rule
+            return self.logic.tool.has_fishing_rod(2)
         if fish_quality == FishQuality.gold:
-            return rod_rule & self.logic.skill.has_level(Skill.fishing, 4)
+            return self.logic.skill.has_level(Skill.fishing, 4) & self.can_use_tackle(Fishing.quality_bobber)
         if fish_quality == FishQuality.iridium:
-            return rod_rule & self.logic.skill.has_level(Skill.fishing, 10)
+            return self.logic.skill.has_level(Skill.fishing, 10) & self.can_use_tackle(Fishing.quality_bobber)
 
         raise ValueError(f"Quality {fish_quality} is unknown.")
 
+    def can_use_tackle(self, tackle: str) -> StardewRule:
+        return self.logic.tool.has_fishing_rod(4) & self.logic.has(tackle)
+
     def can_catch_every_fish(self) -> StardewRule:
         rules = [self.has_max_fishing()]
 

worlds/tunic/options.py

@@ -111,8 +111,10 @@ class EntranceRando(TextChoice):
     internal_name = "entrance_rando"
     display_name = "Entrance Rando"
     alias_false = 0
+    alias_off = 0
     option_no = 0
     alias_true = 1
+    alias_on = 1
     option_yes = 1
     default = 0