Generation code

Author: plyd823

worlds/wsr/LocationList.py

@@ -24,7 +24,8 @@
 )
 from NetUtils import ClientStatus, NetworkItem, NetworkPlayer
 
-from .items import wsr_items
+from .items import wsr_items, WSRItem
+from .LocationList import location_table
 
 if TYPE_CHECKING:
     import kvui
@@ -86,7 +87,7 @@ class CommandRequest:
     def __init__(self, command: bytes, timeout: float = 10.0):
         self.command = command
         self.timeout = timeout
-        self.future = asyncio.get_running_loop().create_future() # asyncio.Future()
+        self.future = asyncio.Future()
         self.timestamp = time.time()
 
 # =============================================================================#
@@ -467,9 +468,6 @@ async def server_auth(self, password_requested: bool = False) -> None:
 
         @param password_requested: Whether the server requires a password. Defaults to `False`.
         """
-
-        self.log("Authenticating with the Archipelago server...")
-
         if password_requested and not self.password:
             await super().server_auth(password_requested)
 
@@ -495,7 +493,7 @@ def on_package(self, cmd: str, args: dict[str, Any]) -> None:
                 self.last_rcvd_index = args["index"]
 
                 for item in args["items"]:
-                    self.items_rcvd.append(item, self.last_rcvd_index)
+                    self.items_rcvd.append((item, self.last_rcvd_index))
                     self.last_rcvd_index += 1
 
                 self.items_rcvd.sort(key=lambda v: v[1])
@@ -534,7 +532,26 @@ async def check_locations(self) -> None:
 
         response = await self.wii_client.send_packet(bytes(), packet_type_id=CommandID.LOCATION)
 
-        logger.info(f"Location Data in bytes: {self.wii_client.most_recent_packet_data}")
+        p_data = self.wii_client.most_recent_packet_data
+
+        if(int.from_bytes((p_data), byteorder="big") == 4294967295):
+            return
+        
+        locations_checked = []
+        location = None
+
+        for i in range(0, len(p_data), 4):
+            location = int.from_bytes(p_data[i:i+4], byteorder="big")
+            for l in self.missing_locations:
+                logger.info(l)
+            if location in self.missing_locations:
+                self.locations_checked.add(WSRItem.get_apid(location))
+                locations_checked.append(location)
+
+        if locations_checked:
+            logger.info(f"Sending new check: {p_data}")
+            await self.send_msgs([{"cmd": "LocationsChecks", "locations": locations_checked}])
+            
 
 
 
@@ -593,7 +610,6 @@ async def sync_loop(ctx: WSRContext) -> None:
             if ctx.is_hooked():
                 await ctx.give_items()
                 await ctx.check_locations()
-                
                 if ctx.awaiting_rom:
                     await ctx.server_auth()
 

worlds/wsr/WSRClient.py

@@ -1,10 +1,11 @@
 from BaseClasses import Item, ItemClassification, Tutorial, Location, MultiWorld
 from .items import item_table, create_item, create_itempool
-from .regions import create_region
+from .regions import create_region, create_regions
 from .locations import location_table, is_location_valid, get_locations_names, get_total_locations
 from .options import WSROptions, StampGoal, ChampionGoal, ProStatusGoal, Traps, StartingItems, SportsUnlockState, \
                     IncludeHardStamps, IncludeLongStamps, ExcludedStamps
-from .types import CategoryIndex, SportIndex, WSRSport, WSRItemData
+from .types import CategoryIndex, SportIndex, WSRItemData, WSRItem
+from worlds.Files import APPlayerContainer, AutoPatchRegister
 from worlds.AutoWorld import World, WebWorld, CollectionState
 from worlds.generic.Rules import add_rule
 from typing import List, Dict, TextIO
@@ -46,7 +47,7 @@ class WSRWeb(WebWorld):
         "setup/en",
         ["Kiwi", "Plyd", "Cyndifusic", "Dragonz"]
     )]
-    theme = "ice"
+    theme = "partyTime"
     rich_text_options_doc = True
 
 class WSRWorld(World):
@@ -68,10 +69,10 @@ def generate_early(self):
         return super().generate_early()
 
     def create_regions(self):
-        #TODO: create regions
-        pass
+        create_regions(self)
 
     def create_items(self):
+        # must have logic to fill progressive checks first to see how many junk items to fill the world
         self.multiworld.itempool += create_itempool(self)
 
     def set_rules(self):
@@ -96,7 +97,7 @@ def collect(self, state: "CollectionState", item: "Item") -> bool:
 
     def remove(self, state: "CollectionState", item: "Item") -> bool:
         old_count: int = state.count(item.name, self.player)
-        change = super().collect(state,item)
+        change = super().remove(state,item)
         if change and old_count == 1:
             if "Stamp" in item.name:
                 state.prog_items[self.player]["Stamps"] -= 1

worlds/wsr/WiiSportsResort.apworld

@@ -293,7 +293,7 @@
             "Swordplay Speed Slice (Stamp) - Double Time": "True",
             "Swordplay Speed Slice (Stamp) - A Cut Above": "True",
             "Swordplay Speed Slice - Pro Status": "True",
-            "Swordplay Speed Slice - Beat The Champion (Matt):": "True",
+            "Swordplay Speed Slice - Beat The Champion (Matt)": "True",
             "Swordplay Speed Slice - First Win": "True"
 
         }