ubufugu/dockipelago
1
0
Fork 0
forked from mirror/Archipelago
Code Issues Pull Requests 1 Actions Activity

DS3: Remove the useless DS3 items and locations classes

Browse Source
This commit is contained in:
Marechal-l
2022-07-14 10:54:02 +02:00
parent 946c1a58f3
commit 6bb690e6a9
4 changed files with 9 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
worlds/dark_souls_3/Items.py
View File

@@ -1,10 +0,0 @@
import typing
from BaseClasses import Item
from worlds.dark_souls_3.data.items_data import item_dictionary_table
class DarkSouls3Item(Item):
@staticmethod
def get_item_name_to_id() -> typing.Dict[str, int]:
return item_dictionary_table

14
worlds/dark_souls_3/Locations.py
View File

@@ -1,14 +0,0 @@
import typing
from BaseClasses import Location, Region, RegionType
from worlds.dark_souls_3.data.locations_data import dictionary_table
class LocationData(int):
code: int
class DarkSouls3Location(Location):
@staticmethod
def get_location_name_to_id() -> typing.Dict[str, int]:
return dictionary_table

12
worlds/dark_souls_3/__init__.py
View File

@@ -4,10 +4,8 @@ import os
from random import randint
from .Options import dark_souls_options # the options we defined earlier
from .Items import DarkSouls3Item # data used below to add items to the World
from .Locations import DarkSouls3Location # same as above
from .data.items_data import weapons_upgrade_5_table, weapons_upgrade_10_table, item_dictionary_table, key_items_list
from .data.locations_data import dictionary_table, cemetery_of_ash_table, fire_link_shrine_table, \
from .data.locations_data import location_dictionary_table, cemetery_of_ash_table, 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, \
@@ -44,7 +42,7 @@ class DarkSouls3World(World):
def create_item(self, name: str) -> Item:
data = self.item_name_to_id[name]
return DarkSouls3Item(
return Item(
name, ItemClassification.progression if name in key_items_list else
ItemClassification.useful, data, self.player)
@@ -231,7 +229,7 @@ class DarkSouls3World(World):
items_address.append(item_dictionary[location.item.name])
if location.player == self.player:
locations_address.append(dictionary_table[location.name])
locations_address.append(location_dictionary_table[location.name])
locations_id.append(location.address)
if location.item.player == self.player:
locations_target.append(item_dictionary[location.item.name])
@@ -277,5 +275,5 @@ class DarkSouls3World(World):
# The following two dicts are required for the generation to know which
# items exist. They could be generated from json or something else. They can
# include events, but don't have to since events will be placed manually.
item_name_to_id = {name: id for id, name in enumerate(DarkSouls3Item.get_item_name_to_id(), base_id)}
location_name_to_id = {name: id for id, name in enumerate(DarkSouls3Location.get_location_name_to_id(), base_id)}
item_name_to_id = {name: id for id, name in enumerate(item_dictionary_table, base_id)}
location_name_to_id = {name: id for id, name in enumerate(location_dictionary_table, base_id)}

8
worlds/dark_souls_3/data/locations_data.py
View File

@@ -417,7 +417,7 @@ archdragon_peak_table = {
"AP: Soul of the Nameless King": 0x400002D2,
}
dictionary_table = {**cemetery_of_ash_table, **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_table = {**cemetery_of_ash_table, **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}