format

Author: Killklli

DK64Client.py

@@ -110,6 +110,46 @@ def safe_to_send(self):
         countdown_value = self.n64_client.read_u8(memory_location + DK64MemoryMap.safety_text_timer)
         return countdown_value == 0
 
+    def _getShopStatus(self, p_type: int, p_value: int, p_kong: int) -> bool:
+        if p_type == 0xFFFF:
+            return False
+        if p_value == 0:
+            return False
+        if p_kong > 4:
+            p_kong = 0
+        kong_base = 0x807FC950 + (p_kong * 0x5E)
+        if p_type < 5:
+            val = self.n64_client.read_u8(kong_base + p_type)
+            if p_type in (1, 3):
+                # Slam, Ammo Belt
+                return val >= p_type
+            else:
+                return (val & (1 << (p_value - 1))) != 0
+        else:
+            return self.readFlag(p_value) != 0
+
+    def getCheckStatus(self, check_type, flag_index=None, shop_index=None, level_index=None, kong_index=None) -> bool:
+        # shop_index: 0 = cranky, 1 = funky, 2 = candy, 3=bfi
+        # flag_index: as expected
+        if check_type == "shop":
+            if shop_index == 3:
+                header = 0x807FF6E8
+            else:
+                header = 0x807FF400 + (shop_index * 0xF0) + (kong_index * 0x30) + (level_index * 6)
+            purchase_type = self.n64_client.read_u16(header + 0)
+            purchase_value = self.n64_client.read_u16(header + 2)
+            purchase_kong = self.n64_client.read_u8(header + 4)
+            return self._getShopStatus(purchase_type, purchase_value, purchase_kong)
+        else:
+            for flut_index in range(0x400):
+                raw_flag = self.n64_client.read_u16(0x807E2EE0 + (4 * flut_index))
+                if raw_flag == flag_index:
+                    target_flag = self.n64_client.read_u16(0x807E2EE0 + (4 * flut_index) + 2)
+                    return self.readFlag(target_flag) != 0
+                elif raw_flag == 0xFFFF:
+                    return self.readFlag(flag_index) != 0
+
+    # TODO: We need to modify this function to use getCheckStatus instead of the gameboy logic
     async def readChecks(self, cb):
         new_checks = []
         for check in self.remaining_checks:

worlds/dk64/client/convert.py

@@ -6,5 +6,5 @@
     value = location_flag_ids[flag]
     if location_names_to_id.get(value):
         print(value)
-        
-print(len(location_flag_ids))
+
+print(len(location_flag_ids))

worlds/dk64/client/item_ids.py

@@ -1,4 +1,3 @@
-
 # AP_ID, Name, Flag Id (Hex int), Fed ID (standard int)
 item_ids = {
     14041089: {"name": "No Item", "fed_id": None, "flag_id": 0},

worlds/dk64/client/location_ids.py

@@ -1,4 +1,3 @@
-
 location_flag_ids = {
     1: "Japes Lanky Mad Maze Maul",
     2: "Japes Tiny Splish-Splash Salvage",
@@ -351,4 +350,3 @@
     # 736: "Isles Dirt: Banana Hoard",
     # 739: "Isles Dirt: Castle Lobby",
 }
-

worlds/dk64/client/pj64.py

@@ -2,7 +2,7 @@
 
 import socket
 import json
-from client_options.common import N64Exception
+from dk64.client.common import N64Exception
 
 
 class PJ64Client:
@@ -89,6 +89,28 @@ def read_u8(self, address):
         except (ConnectionRefusedError, ConnectionResetError, ConnectionAbortedError):
             raise N64Exception("Connection refused or reset")
 
+    def read_u16(self, address):
+        """
+        Reads a 16-bit unsigned integer from the specified memory address.
+
+        Args:
+            address (int): The memory address to read from.
+
+        Returns:
+            int: The 16-bit unsigned integer read from the specified address.
+
+        Raises:
+            N64Exception: If the connection is refused, reset, or aborted.
+        """
+        try:
+            self._connect()
+            address = hex(address)
+            self.socket.send(f"read u16 {address} 2".encode())
+            data = int(self.socket.recv(1024).decode())
+            return data
+        except (ConnectionRefusedError, ConnectionResetError, ConnectionAbortedError):
+            raise N64Exception("Connection refused or reset")
+
     def read_u32(self, address):
         """
         Reads a 32-bit unsigned integer from the specified memory address.