From 1790a389c7e85630a0ba9197f04e56d67205a793 Mon Sep 17 00:00:00 2001
From: Scipio Wright <scipiowright@gmail.com>
Date: Tue, 15 Jul 2025 17:04:27 -0400
Subject: [PATCH] TUNIC: Update Tests Per #4982 (#5191)

---
 worlds/tunic/test/__init__.py    | 6 ------
 worlds/tunic/test/bases.py       | 5 +++++
 worlds/tunic/test/test_access.py | 2 +-
 worlds/tunic/test/test_combat.py | 6 ++----
 4 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 worlds/tunic/test/bases.py

diff --git a/worlds/tunic/test/__init__.py b/worlds/tunic/test/__init__.py
index d0b68955..e69de29b 100644
--- a/worlds/tunic/test/__init__.py
+++ b/worlds/tunic/test/__init__.py
@@ -1,6 +0,0 @@
-from test.bases import WorldTestBase
-
-
-class TunicTestBase(WorldTestBase):
-    game = "TUNIC"
-    player = 1
diff --git a/worlds/tunic/test/bases.py b/worlds/tunic/test/bases.py
new file mode 100644
index 00000000..0e51bcd0
--- /dev/null
+++ b/worlds/tunic/test/bases.py
@@ -0,0 +1,5 @@
+from test.bases import WorldTestBase
+
+
+class TunicTestBase(WorldTestBase):
+    game = "TUNIC"
diff --git a/worlds/tunic/test/test_access.py b/worlds/tunic/test/test_access.py
index 6a26180c..1896db5d 100644
--- a/worlds/tunic/test/test_access.py
+++ b/worlds/tunic/test/test_access.py
@@ -1,5 +1,5 @@
-from . import TunicTestBase
 from .. import options
+from .bases import TunicTestBase
 
 
 class TestAccess(TunicTestBase):
diff --git a/worlds/tunic/test/test_combat.py b/worlds/tunic/test/test_combat.py
index c0e76ef9..70324247 100644
--- a/worlds/tunic/test/test_combat.py
+++ b/worlds/tunic/test/test_combat.py
@@ -1,17 +1,15 @@
 from BaseClasses import ItemClassification
 from collections import Counter
 
-from . import TunicTestBase
-from .. import options
+from .. import options, TunicWorld
+from .bases import TunicTestBase
 from ..combat_logic import (check_combat_reqs, area_data, get_money_count, calc_effective_hp, get_potion_level,
                             get_hp_level, get_def_level, get_sp_level, has_combat_reqs)
 from ..items import item_table
-from .. import TunicWorld
 
 
 class TestCombat(TunicTestBase):
     options = {options.CombatLogic.internal_name: options.CombatLogic.option_on}
-    player = 1
     world: TunicWorld
     combat_items = []
     # these are items that are progression that do not contribute to combat logic