KH2: Async fix and linter cleanup (ArchipelagoMW#1796)

MadiMadsen · May 7, 2023 · a8b76b1 · a8b76b1
1 parent c8ebad1
commit a8b76b1
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/KH2Client.py b/KH2Client.py
@@ -134,10 +134,10 @@ def __init__(self, server_address, password):
         self.AbilityQuantityDict = {item: self.item_name_to_data[item].quantity for item in self.all_abilities}
         #  Growth:[level 1,level 4,slot]
         self.growth_values_dict = {"High Jump":    [0x05E, 0x061, 0x25DA],
-                                   "Quick Run":    [0x62, 0x65,   0x25DC],
+                                   "Quick Run":    [0x62, 0x65, 0x25DC],
                                    "Dodge Roll":   [0x234, 0x237, 0x25DE],
                                    "Aerial Dodge": [0x066, 0x069, 0x25E0],
-                                   "Glide":        [0x6A, 0x6D,   0x25E2]}
+                                   "Glide":        [0x6A, 0x6D, 0x25E2]}
         self.boost_to_anchor_dict = {
             "Power Boost":   0x24F9,
             "Magic Boost":   0x24FA,
@@ -271,6 +271,21 @@ def on_package(self, cmd: str, args: dict):
 
         if cmd in {"ReceivedItems"}:
             start_index = args["index"]
+            if start_index == 0:
+                self.kh2seedsave["itemIndex"] = - 1
+                self.kh2seedsave["AmountInvo"]["ServerItems"] = {
+                    "Ability":      {},
+                    "Amount":       {},
+                    "Growth":       {"High Jump":    0, "Quick Run": 0, "Dodge Roll": 0,
+                                     "Aerial Dodge": 0,
+                                     "Glide":        0},
+                    "Bitmask":      [],
+                    "Weapon":       {"Sora": [], "Donald": [], "Goofy": []},
+                    "Equipment":    [],
+                    "Magic":        {},
+                    "StatIncrease": {},
+                    "Boost":        {},
+                }
             if start_index > self.kh2seedsave["itemIndex"]:
                 self.kh2seedsave["itemIndex"] = start_index
                 for item in args['items']:
@@ -295,7 +310,6 @@ async def checkWorldLocations(self):
                             and (int.from_bytes(
                             self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
                             "big") & 0x1 << data.bitIndex) > 0:
-
                         self.sending = self.sending + [(int(locationId))]
         except Exception as e:
             logger.info("Line 285")
@@ -342,15 +356,14 @@ async def checkSlots(self):
                 if locationId not in self.locations_checked:
                     if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
                                       "big") > 0:
-
                         self.sending = self.sending + [(int(locationId))]
 
             for location, data in formSlots.items():
                 locationId = kh2_loc_name_to_id[location]
                 if locationId not in self.locations_checked:
                     if int.from_bytes(self.kh2.read_bytes(self.kh2.base_address + self.Save + data.addrObtained, 1),
                                       "big") & 0x1 << data.bitIndex > 0:
-                        #self.locations_checked
+                        # self.locations_checked
                         self.sending = self.sending + [(int(locationId))]
 
         except Exception as e:
@@ -631,8 +644,8 @@ async def verifyItems(self):
                         self.kh2.write_short(self.kh2.base_address + self.Save + slot, itemData.memaddr)
             # removes the duped ability if client gave faster than the game.
             for charInvo in {"SoraInvo", "DonaldInvo", "GoofyInvo"}:
-                if self.kh2.read_short(self.kh2.base_address + self.Save + self.kh2seedsave[charInvo][1]) != 0 and\
-                        self.kh2seedsave[charInvo][1]+2 < self.kh2seedsave[charInvo][0]:
+                if self.kh2.read_short(self.kh2.base_address + self.Save + self.kh2seedsave[charInvo][1]) != 0 and \
+                        self.kh2seedsave[charInvo][1] + 2 < self.kh2seedsave[charInvo][0]:
                     self.kh2.write_short(self.kh2.base_address + self.Save + self.kh2seedsave[charInvo][1], 0)
             # remove the dummy level 1 growths if they are in these invo slots.
             for inventorySlot in {0x25CE, 0x25D0, 0x25D2, 0x25D4, 0x25D6, 0x25D8}:
@@ -738,7 +751,8 @@ async def verifyItems(self):
                 if itemName == "AP Boost":
                     amountOfUsedBoosts -= 50
                 totalBoosts = (amountOfBoostsInInvo + amountOfUsedBoosts)
-                if totalBoosts <= amountOfItems - self.kh2seedsave["SoldBoosts"][itemName] and amountOfBoostsInInvo < 255:
+                if totalBoosts <= amountOfItems - self.kh2seedsave["SoldBoosts"][
+                    itemName] and amountOfBoostsInInvo < 255:
                     self.kh2.write_bytes(self.kh2.base_address + self.Save + itemData.memaddr,
                                          (amountOfBoostsInInvo + 1).to_bytes(1, 'big'), 1)