Location table no longer relies on csv, removed data folder, renamed tunic doc to pass unit tests

Author: ScipioWright

worlds/tunic/Locations.py

@@ -7,19 +7,24 @@ class SwordProgression(DefaultOnToggle):
     """Option to play with sword progression. Sword Progression adds four possible upgrades to find that will
     level up your sword in the order of Stick -> Sword -> Lvl 3 Sword -> Lvl 4 Sword."""
 
+
 class StartWithSword(Toggle):
     """Option to start with a sword in the player's inventory."""
     display_name = "Start With Sword"
 
+
 class KeysBehindBosses(Toggle):
     """Option to choose if the three hexagon keys are placed randomly or behind their respective boss fight"""
     display_name = "Keys Behind Bosses"
 
+
 class AbilityShuffling(Toggle):
     """Choose whether to lock the usage of Prayer, Holy Cross*, and Ice Rod until the relevant poge of the manual is found.
         *Certain Holy Cross usages are still allowed, such as free bombs, the seeking spell and other player-facing codes.
     """
     display_name = "Ability Shuffling"
+
+
 '''
 class BonusUpgrades(Toggle):
     """Makes the Hero Relics and Golden Trophy Collectibles award bonus stat upgrades when found. (Can also be turned
@@ -35,11 +40,14 @@ class FoolTraps(Choice):
     option_double = 2
     option_onslaught = 3
 '''
+
+
 class HexagonQuest(Toggle):
     """Choose whether to play the Hexagon Quest game mode. This mode shuffles 30 Golden Hexagons into the item pool and
     allows the game to be ended after collecting 20 of them."""
     display_name = "Hexagon Quest"
 
+
 tunic_options: typing.Dict[str, type(Option)] = {
     "sword_progression": SwordProgression,
     "start_with_sword": StartWithSword,

worlds/tunic/Options.py

@@ -2,7 +2,7 @@
 
 from BaseClasses import Region, Location, Item, Tutorial, ItemClassification
 from .Items import filler_items, item_table
-from .Locations import TunicLocations
+from .Locations import location_table
 from .Rules import set_location_rules, set_region_rules, hexagon_quest_abilities, set_abilities
 from .Regions import tunic_regions
 from .Options import tunic_options
@@ -43,8 +43,7 @@ class TunicWorld(World):
 
     data_version = 1
     tunic_items = item_table
-    tunic_locations = TunicLocations()
-    tunic_locations.populate_locations()
+    tunic_locations = location_table
     option_definitions = tunic_options
 
     item_name_to_id = {}
@@ -56,8 +55,8 @@ class TunicWorld(World):
         item_name_to_id[item_name] = item_base_id
         item_base_id += 1
 
-    for location in tunic_locations.locations:
-        location_name_to_id[location.name] = location_base_id
+    for location_name, location_data in location_table.items():
+        location_name_to_id[location_name] = location_base_id
         location_base_id += 1
 
     def create_item(self, name: str) -> TunicItem:
@@ -66,7 +65,6 @@ def create_item(self, name: str) -> TunicItem:
         return TunicItem(name, item_data.classification, self.item_name_to_id[name], self.player)
 
     def create_items(self):
-
         hexagon_locations: Dict[str, str] = {
             "Red Hexagon": "Fortress Arena - Siege Engine/Vault Key Pickup",
             "Green Hexagon": "Librarian - Hexagon Green",
@@ -91,6 +89,7 @@ def create_items(self):
 
                 for i in range(0, item_data.quantity_in_item_pool):
                     items.append(self.create_item(item_name))
+                # adding a money x1 to even out the pool with this option
                 items.append(self.create_item("Money x1"))
             elif self.multiworld.hexagon_quest[self.player].value and \
                     ("Pages" in item_name or item_name in ["Red Hexagon", "Green Hexagon", "Blue Hexagon"]):
@@ -115,8 +114,7 @@ def create_regions(self):
             region.add_exits(tunic_regions[region_name])
 
         for location_name in self.location_name_to_id:
-            region = self.multiworld.get_region(self.tunic_locations.locations_lookup[location_name].region,
-                                                self.player)
+            region = self.multiworld.get_region(location_table[location_name].region, self.player)
             location = TunicLocation(self.player, location_name, self.location_name_to_id[location_name], region)
             region.locations.append(location)