From ad9985019287c448bdecfcaabb2f9e2bf3357a7a Mon Sep 17 00:00:00 2001
From: Fabian Dill <Berserker66@users.noreply.github.com>
Date: Thu, 19 May 2022 03:03:33 +0200
Subject: [PATCH] SC2: some cleanup (#532)

* SC2: some cleanup

* SC2: some cleanup in client
---
 StarcraftClient.py        |  9 ---------
 worlds/sc2wol/__init__.py | 12 +++++-------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/StarcraftClient.py b/StarcraftClient.py
index db4402d9..f7e21fa0 100644
--- a/StarcraftClient.py
+++ b/StarcraftClient.py
@@ -126,25 +126,16 @@ async def main():
     if ctx.server_task is None:
         ctx.server_task = asyncio.create_task(server_loop(ctx), name="ServerLoop")
 
-    input_task = None
     if gui_enabled:
         ctx.run_gui()
     ctx.run_cli()
 
-    if sys.stdin:
-        input_task = asyncio.create_task(console_loop(ctx), name="Input")
-
     await ctx.exit_event.wait()
 
     ctx.server_address = None
     ctx.snes_reconnect_address = None
     await ctx.shutdown()
 
-    if ui_task:
-        await ui_task
-
-    if input_task:
-        input_task.cancel()
 
 maps_table = ["ap_traynor01", "ap_traynor02", "ap_traynor03", "ap_thanson01", "ap_thanson02", "ap_thanson03a", "ap_thanson03b", "ap_ttychus01",
               "ap_ttychus02", "ap_ttychus03", "ap_ttychus04", "ap_ttychus05", "ap_ttosh01", "ap_ttosh02", "ap_ttosh03a", "ap_ttosh03b",
diff --git a/worlds/sc2wol/__init__.py b/worlds/sc2wol/__init__.py
index 70bcafee..a06a37ee 100644
--- a/worlds/sc2wol/__init__.py
+++ b/worlds/sc2wol/__init__.py
@@ -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)):