From cca898587730ab78c0d77ac8557fe958cfa2cea3 Mon Sep 17 00:00:00 2001 From: Marechal-l Date: Sun, 23 Oct 2022 10:31:07 +0200 Subject: [PATCH] DS3: Removed useless region for locations IDs consistency --- worlds/dark_souls_3/__init__.py | 7 ++----- worlds/dark_souls_3/data/locations_data.py | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/worlds/dark_souls_3/__init__.py b/worlds/dark_souls_3/__init__.py index c56e6752dc..df56306cc5 100644 --- a/worlds/dark_souls_3/__init__.py +++ b/worlds/dark_souls_3/__init__.py @@ -6,7 +6,7 @@ from .Items import DarkSouls3Item from .Locations import DarkSouls3Location from .Options import dark_souls_options from .data.items_data import weapons_upgrade_5_table, weapons_upgrade_10_table, item_dictionary, key_items_list -from .data.locations_data import location_dictionary, cemetery_of_ash_table, fire_link_shrine_table, \ +from .data.locations_data import location_dictionary, fire_link_shrine_table, \ high_wall_of_lothric, \ undead_settlement_table, road_of_sacrifice_table, consumed_king_garden_table, cathedral_of_the_deep_table, \ farron_keep_table, catacombs_of_carthus_table, smouldering_lake_table, irithyll_of_the_boreal_valley_table, \ @@ -82,7 +82,6 @@ class DarkSouls3World(World): self.world.regions.append(menu_region) # Create all Vanilla regions of Dark Souls III - cemetery_of_ash_region = self.create_region("Cemetery Of Ash", cemetery_of_ash_table) firelink_shrine_region = self.create_region("Firelink Shrine", fire_link_shrine_table) firelink_shrine_bell_tower_region = self.create_region("Firelink Shrine Bell Tower", firelink_shrine_bell_tower_table) @@ -107,9 +106,7 @@ class DarkSouls3World(World): # Create the entrance to connect those regions menu_region.exits.append(Entrance(self.player, "New Game", menu_region)) - self.world.get_entrance("New Game", self.player).connect(cemetery_of_ash_region) - cemetery_of_ash_region.exits.append(Entrance(self.player, "Goto Firelink Shrine", cemetery_of_ash_region)) - self.world.get_entrance("Goto Firelink Shrine", self.player).connect(firelink_shrine_region) + self.world.get_entrance("New Game", self.player).connect(firelink_shrine_region) firelink_shrine_region.exits.append(Entrance(self.player, "Goto High Wall of Lothric", firelink_shrine_region)) firelink_shrine_region.exits.append(Entrance(self.player, "Goto Kiln Of The First Flame", diff --git a/worlds/dark_souls_3/data/locations_data.py b/worlds/dark_souls_3/data/locations_data.py index 7230bb795d..855b4a9ab3 100644 --- a/worlds/dark_souls_3/data/locations_data.py +++ b/worlds/dark_souls_3/data/locations_data.py @@ -5,9 +5,6 @@ Regular expression parser https://regex101.com/r/XdtiLR/2 List of locations https://darksouls3.wiki.fextralife.com/Locations """ -cemetery_of_ash_table = { -} - fire_link_shrine_table = { # "FS: Coiled Sword": 0x40000859, You can still light the Firelink Shrine fire whether you have it or not, useless "FS: Broken Straight Sword": 0x001EF9B0, @@ -440,12 +437,12 @@ archdragon_peak_table = { "AP: Havel's Greatshield": 0x013376F0, } -location_tables = [cemetery_of_ash_table, fire_link_shrine_table, firelink_shrine_bell_tower_table, high_wall_of_lothric, undead_settlement_table, road_of_sacrifice_table, +location_tables = [fire_link_shrine_table, firelink_shrine_bell_tower_table, high_wall_of_lothric, undead_settlement_table, road_of_sacrifice_table, cathedral_of_the_deep_table, farron_keep_table, catacombs_of_carthus_table, smouldering_lake_table, irithyll_of_the_boreal_valley_table, irithyll_dungeon_table, profaned_capital_table, anor_londo_table, lothric_castle_table, consumed_king_garden_table, grand_archives_table, untended_graves_table, archdragon_peak_table] -location_dictionary = {**cemetery_of_ash_table, **fire_link_shrine_table, **firelink_shrine_bell_tower_table, **high_wall_of_lothric, **undead_settlement_table, **road_of_sacrifice_table, +location_dictionary = {**fire_link_shrine_table, **firelink_shrine_bell_tower_table, **high_wall_of_lothric, **undead_settlement_table, **road_of_sacrifice_table, **cathedral_of_the_deep_table, **farron_keep_table, **catacombs_of_carthus_table, **smouldering_lake_table, **irithyll_of_the_boreal_valley_table, **irithyll_dungeon_table, **profaned_capital_table, **anor_londo_table, **lothric_castle_table, **consumed_king_garden_table, **grand_archives_table, **untended_graves_table, **archdragon_peak_table}