SC2: some cleanup (#532)

* SC2: some cleanup

* SC2: some cleanup in client
This commit is contained in:
Fabian Dill
2022-05-19 03:03:33 +02:00
committed by GitHub
parent c93eeb3607
commit ad99850192
2 changed files with 5 additions and 16 deletions

View File

@@ -41,9 +41,6 @@ class SC2WoLWorld(World):
locked_locations: typing.List[str]
location_cache: typing.List[Location]
def _get_sc2wol_data(self):
return {}
def __init__(self, world: MultiWorld, player: int):
super(SC2WoLWorld, self).__init__(world, player)
self.location_cache = []
@@ -51,7 +48,7 @@ class SC2WoLWorld(World):
def _create_items(self, name: str):
data = get_full_item_list()[name]
return [self.create_item(name)] * data.quantity
return [self.create_item(name) for _ in range(data.quantity)]
def create_item(self, name: str) -> Item:
data = get_full_item_list()[name]
@@ -59,7 +56,7 @@ class SC2WoLWorld(World):
def create_regions(self):
create_regions(self.world, self.player, get_locations(self.world, self.player),
self.location_cache)
self.location_cache)
def generate_basic(self):
excluded_items = get_excluded_items(self, self.world, self.player)
@@ -81,10 +78,10 @@ class SC2WoLWorld(World):
return self.world.random.choice(filler_items)
def fill_slot_data(self):
slot_data = self._get_sc2wol_data()
slot_data = {}
for option_name in sc2wol_options:
option = getattr(self.world, option_name)[self.player]
if slot_data.get(option_name, None) is None and type(option.value) in {str, int}:
if type(option.value) in {str, int}:
slot_data[option_name] = int(option.value)
return slot_data
@@ -154,6 +151,7 @@ def get_item_pool(world: MultiWorld, player: int, excluded_items: Set[str]) -> L
return pool
def fill_item_pool_with_dummy_items(self: SC2WoLWorld, world: MultiWorld, player: int, locked_locations: List[str],
location_cache: List[Location], pool: List[Item]):
for _ in range(len(location_cache) - len(locked_locations) - len(pool)):