threeandthreee
diff --git a/‎worlds/tunic/__init__.py‎
Lines changed: 148 additions & 95 deletions b/‎worlds/tunic/__init__.py‎
Lines changed: 148 additions & 95 deletions
diff --git a/‎worlds/tunic/breakables.py‎
Lines changed: 12 additions & 7 deletions b/‎worlds/tunic/breakables.py‎
Lines changed: 12 additions & 7 deletions
diff --git a/‎worlds/tunic/combat_logic.py‎
Lines changed: 24 additions & 22 deletions b/‎worlds/tunic/combat_logic.py‎
Lines changed: 24 additions & 22 deletions
diff --git a/‎worlds/tunic/constants.py‎
Lines changed: 51 additions & 0 deletions b/‎worlds/tunic/constants.py‎
Lines changed: 51 additions & 0 deletions
@@ -1,16 +1,16 @@
+from enum import IntEnum
 from typing import TYPE_CHECKING, NamedTuple
 
-from enum import IntEnum
 from BaseClasses import CollectionState, Region
 from worlds.generic.Rules import set_rule
-from .rules import has_sword, has_melee
+
+from .constants import base_id
 from .er_rules import can_shop
-if TYPE_CHECKING:
-    from . import TunicWorld
+from .logic_helpers import has_sword, has_melee
 
 
-# just getting an id that is a decent chunk ahead of the grass ones
-breakable_base_id = 509342400 + 8000
+if TYPE_CHECKING:
+    from . import TunicWorld
 
 
 class BreakableType(IntEnum):
@@ -341,6 +341,7 @@ class TunicLocationData(NamedTuple):
 }
 
 
+breakable_base_id = base_id + 8000
 breakable_location_name_to_id: dict[str, int] = {name: breakable_base_id + index
                                                  for index, name in enumerate(breakable_location_table)}
 
@@ -358,6 +359,7 @@ class TunicLocationData(NamedTuple):
     "Beneath the Well Main": "Beneath the Well",
     "Well Boss": "Dark Tomb Checkpoint",
     "Dark Tomb Main": "Dark Tomb",
+    "Magic Dagger House": "West Garden House",
     "Fortress Courtyard Upper": "Fortress Courtyard",
     "Fortress Courtyard Upper pot": "Fortress Courtyard",
     "Fortress Courtyard west pots": "Fortress Courtyard",
@@ -370,13 +372,16 @@ class TunicLocationData(NamedTuple):
     "Fortress Grave Path westmost pot": "Fortress Grave Path",
     "Fortress Grave Path pots": "Fortress Grave Path",
     "Dusty": "Fortress Leaf Piles",
-    "Frog Stairs Upper": "Frog Stairs",
+    "Frog Stairs Upper": "Frog Stairway",
+    "Frog's Domain Front": "Frog's Domain",
+    "Frog's Domain Main": "Frog's Domain",
     "Quarry Monastery Entry": "Quarry",
     "Quarry Back": "Quarry",
     "Lower Quarry": "Quarry",
     "Lower Quarry upper pots": "Quarry",
     "Even Lower Quarry": "Quarry",
     "Monastery Back": "Monastery",
+    "Cathedral Main": "Cathedral",
 }
 
 
 
@@ -1,10 +1,12 @@
-from typing import Dict, List, NamedTuple, Tuple, Optional
-from enum import IntEnum
 from collections import defaultdict
+from enum import IntEnum
+from typing import NamedTuple
+
 from BaseClasses import CollectionState
-from .rules import has_sword, has_melee
 from worlds.AutoWorld import LogicMixin
 
+from .logic_helpers import has_sword, has_melee
+
 
 # the vanilla stats you are expected to have to get through an area, based on where they are in vanilla
 class AreaStats(NamedTuple):
@@ -16,12 +18,12 @@ class AreaStats(NamedTuple):
     sp_level: int
     mp_level: int
     potion_count: int
-    equipment: List[str] = []
+    equipment: list[str] = []
     is_boss: bool = False
 
 
 # the vanilla upgrades/equipment you would have
-area_data: Dict[str, AreaStats] = {
+area_data: dict[str, AreaStats] = {
     # The upgrade page is right by the Well entrance. Upper Overworld by the chest in the top right might need something
     "Overworld": AreaStats(1, 1, 1, 1, 1, 1, 0, ["Stick"]),
     "East Forest": AreaStats(1, 1, 1, 1, 1, 1, 0, ["Sword"]),
@@ -52,9 +54,9 @@ class AreaStats(NamedTuple):
 
 # these are used for caching which areas can currently be reached in state
 # Gauntlet does not have exclusively higher stat requirements, so it will be checked separately
-boss_areas: List[str] = [name for name, data in area_data.items() if data.is_boss and name != "Gauntlet"]
+boss_areas: list[str] = [name for name, data in area_data.items() if data.is_boss and name != "Gauntlet"]
 # Swamp does not have exclusively higher stat requirements, so it will be checked separately
-non_boss_areas: List[str] = [name for name, data in area_data.items() if not data.is_boss and name != "Swamp"]
+non_boss_areas: list[str] = [name for name, data in area_data.items() if not data.is_boss and name != "Swamp"]
 
 
 class CombatState(IntEnum):
@@ -114,7 +116,7 @@ def has_combat_reqs(area_name: str, state: CollectionState, player: int) -> bool
     return met_combat_reqs
 
 
-def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_data: Optional[AreaStats] = None) -> bool:
+def check_combat_reqs(area_name: str, state: CollectionState, player: int, alt_data: AreaStats | None = None) -> bool:
     data = alt_data or area_data[area_name]
     extra_att_needed = 0
     extra_def_needed = 0
@@ -303,7 +305,7 @@ def has_required_stats(data: AreaStats, state: CollectionState, player: int) ->
 
 
 # returns a tuple of your max attack level, the number of attack offerings
-def get_att_level(state: CollectionState, player: int) -> Tuple[int, int]:
+def get_att_level(state: CollectionState, player: int) -> tuple[int, int]:
     att_offerings = state.count("ATT Offering", player)
     att_upgrades = state.count("Hero Relic - ATT", player)
     sword_level = state.count("Sword Upgrade", player)
@@ -315,44 +317,44 @@ def get_att_level(state: CollectionState, player: int) -> Tuple[int, int]:
 
 
 # returns a tuple of your max defense level, the number of defense offerings
-def get_def_level(state: CollectionState, player: int) -> Tuple[int, int]:
+def get_def_level(state: CollectionState, player: int) -> tuple[int, int]:
     def_offerings = state.count("DEF Offering", player)
     # defense falls off, can just cap it at 8 for simplicity
     return (min(8, 1 + def_offerings
-                + state.count_from_list({"Hero Relic - DEF", "Secret Legend", "Phonomath"}, player))
+                + state.count_from_list(("Hero Relic - DEF", "Secret Legend", "Phonomath"), player))
             + (2 if state.has("Shield", player) else 0)
             + (2 if state.has("Hero's Laurels", player) else 0),
             def_offerings)
 
 
 # returns a tuple of your max potion level, the number of potion offerings
-def get_potion_level(state: CollectionState, player: int) -> Tuple[int, int]:
+def get_potion_level(state: CollectionState, player: int) -> tuple[int, int]:
     potion_offerings = min(2, state.count("Potion Offering", player))
     # your third potion upgrade (from offerings) costs 1,000 money, reasonable to assume you won't do that
     return (1 + potion_offerings
-            + state.count_from_list({"Hero Relic - POTION", "Just Some Pals", "Spring Falls", "Back To Work"}, player),
+            + state.count_from_list(("Hero Relic - POTION", "Just Some Pals", "Spring Falls", "Back To Work"), player),
             potion_offerings)
 
 
 # returns a tuple of your max hp level, the number of hp offerings
-def get_hp_level(state: CollectionState, player: int) -> Tuple[int, int]:
+def get_hp_level(state: CollectionState, player: int) -> tuple[int, int]:
     hp_offerings = state.count("HP Offering", player)
     return 1 + hp_offerings + state.count("Hero Relic - HP", player), hp_offerings
 
 
 # returns a tuple of your max sp level, the number of sp offerings
-def get_sp_level(state: CollectionState, player: int) -> Tuple[int, int]:
+def get_sp_level(state: CollectionState, player: int) -> tuple[int, int]:
     sp_offerings = state.count("SP Offering", player)
     return (1 + sp_offerings
-            + state.count_from_list({"Hero Relic - SP", "Mr Mayor", "Power Up",
-                                     "Regal Weasel", "Forever Friend"}, player),
+            + state.count_from_list(("Hero Relic - SP", "Mr Mayor", "Power Up",
+                                     "Regal Weasel", "Forever Friend"), player),
             sp_offerings)
 
 
-def get_mp_level(state: CollectionState, player: int) -> Tuple[int, int]:
+def get_mp_level(state: CollectionState, player: int) -> tuple[int, int]:
     mp_offerings = state.count("MP Offering", player)
     return (1 + mp_offerings
-            + state.count_from_list({"Hero Relic - MP", "Sacred Geometry", "Vintage", "Dusty"}, player),
+            + state.count_from_list(("Hero Relic - MP", "Sacred Geometry", "Vintage", "Dusty"), player),
             mp_offerings)
 
 
@@ -426,9 +428,9 @@ def calc_def_sp_cost(def_upgrades: int, sp_upgrades: int) -> int:
 
 
 class TunicState(LogicMixin):
-    tunic_need_to_reset_combat_from_collect: Dict[int, bool]
-    tunic_need_to_reset_combat_from_remove: Dict[int, bool]
-    tunic_area_combat_state: Dict[int, Dict[str, int]]
+    tunic_need_to_reset_combat_from_collect: dict[int, bool]
+    tunic_need_to_reset_combat_from_remove: dict[int, bool]
+    tunic_area_combat_state: dict[int, dict[str, int]]
 
     def init_mixin(self, _):
         # the per-player need to reset the combat state when collecting a combat item
 
@@ -0,0 +1,51 @@
+base_id = 509342400
+
+laurels = "Hero's Laurels"
+grapple = "Magic Orb"
+ice_dagger = "Magic Dagger"
+fire_wand = "Magic Wand"
+gun = "Gun"
+lantern = "Lantern"
+fairies = "Fairy"
+coins = "Golden Coin"
+prayer = "Pages 24-25 (Prayer)"
+holy_cross = "Pages 42-43 (Holy Cross)"
+icebolt = "Pages 52-53 (Icebolt)"
+shield = "Shield"
+key = "Key"
+house_key = "Old House Key"
+vault_key = "Fortress Vault Key"
+mask = "Scavenger Mask"
+red_hexagon = "Red Questagon"
+green_hexagon = "Green Questagon"
+blue_hexagon = "Blue Questagon"
+gold_hexagon = "Gold Questagon"
+
+swamp_fuse_1 = "Swamp Fuse 1"
+swamp_fuse_2 = "Swamp Fuse 2"
+swamp_fuse_3 = "Swamp Fuse 3"
+cathedral_elevator_fuse = "Cathedral Elevator Fuse"
+quarry_fuse_1 = "Quarry Fuse 1"
+quarry_fuse_2 = "Quarry Fuse 2"
+ziggurat_miniboss_fuse = "Ziggurat Miniboss Fuse"
+ziggurat_teleporter_fuse = "Ziggurat Teleporter Fuse"
+fortress_exterior_fuse_1 = "Fortress Exterior Fuse 1"
+fortress_exterior_fuse_2 = "Fortress Exterior Fuse 2"
+fortress_courtyard_upper_fuse = "Fortress Courtyard Upper Fuse"
+fortress_courtyard_lower_fuse = "Fortress Courtyard Fuse"
+beneath_the_vault_fuse = "Beneath the Vault Fuse"  # event needs to be renamed probably
+fortress_candles_fuse = "Fortress Candles Fuse"
+fortress_door_left_fuse = "Fortress Door Left Fuse"
+fortress_door_right_fuse = "Fortress Door Right Fuse"
+west_furnace_fuse = "West Furnace Fuse"
+west_garden_fuse = "West Garden Fuse"
+atoll_northeast_fuse = "Atoll Northeast Fuse"
+atoll_northwest_fuse = "Atoll Northwest Fuse"
+atoll_southeast_fuse = "Atoll Southeast Fuse"
+atoll_southwest_fuse = "Atoll Southwest Fuse"
+library_lab_fuse = "Library Lab Fuse"
+
+# "Quarry - [East] Bombable Wall" is excluded from this list since it has slightly different rules
+bomb_walls = ["East Forest - Bombable Wall", "Eastern Vault Fortress - [East Wing] Bombable Wall",
+              "Overworld - [Central] Bombable Wall", "Overworld - [Southwest] Bombable Wall Near Fountain",
+              "Quarry - [West] Upper Area Bombable Wall", "Ruined Atoll - [Northwest] Bombable Wall"]