adb: add from_req

core/adb_handlers/base.py

@@ -150,8 +150,12 @@ class ADBBaseRequest:
         self.head = ADBHeader.from_data(data)
 
 class ADBBaseResponse:
-    def __init__(self, code: int = 0, length: int = 0x20, status: int = 1, game_id: str = "SXXX", store_id: int = 1, keychip_id: str = "A69E01A8888") -> None:
-        self.head = ADBHeader(0xa13e, 0x3087, code, length, status, game_id, store_id, keychip_id)
+    def __init__(self, code: int = 0, length: int = 0x20, status: int = 1, game_id: str = "SXXX", store_id: int = 1, keychip_id: str = "A69E01A8888", protocol_ver: int = 0x3087) -> None:
+        self.head = ADBHeader(0xa13e, protocol_ver, code, length, status, game_id, store_id, keychip_id)
+
+    @classmethod
+    def from_req(cls, req: ADBHeader, cmd: int, length: int = 0x20, status: int = 1) -> "ADBBaseResponse":
+        return cls(cmd, length, status, req.game_id, req.store_id, req.keychip_id, req.protocol_ver)
 
     def append_padding(self, data: bytes):
         """Appends 0s to the end of the data until it's at the correct size"""

core/adb_handlers/campaign.py

@@ -55,6 +55,12 @@ class ADBCampaignResponse(ADBBaseResponse):
     def __init__(self, game_id: str = "SXXX", store_id: int = 1, keychip_id: str = "A69E01A8888", code: int = 0x0C, length: int = 0x200, status: int = 1) -> None:
         super().__init__(code, length, status, game_id, store_id, keychip_id)
         self.campaigns = [Campaign(), Campaign(), Campaign()]
+    
+    @classmethod
+    def from_req(cls, req: ADBHeader) -> "ADBCampaignResponse":
+        c = cls(req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
 
     def make(self) -> bytes:
         body = b""
@@ -78,6 +84,12 @@ class ADBOldCampaignResponse(ADBBaseResponse):
         self.info2 = 0
         self.info3 = 0
     
+    @classmethod
+    def from_req(cls, req: ADBHeader) -> "ADBCampaignResponse":
+        c = cls(req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
+    
     def make(self) -> bytes:
         resp_struct = Struct(
             "info0" / Int32sl,
@@ -103,7 +115,13 @@ class ADBCampaignClearResponse(ADBBaseResponse):
     def __init__(self, game_id: str = "SXXX", store_id: int = 1, keychip_id: str = "A69E01A8888", code: int = 0x0E, length: int = 0x50, status: int = 1) -> None:
         super().__init__(code, length, status, game_id, store_id, keychip_id)
         self.campaign_clear_status = [CampaignClear(), CampaignClear(), CampaignClear()]
-
+    
+    @classmethod
+    def from_req(cls, req: ADBHeader) -> "ADBCampaignResponse":
+        c = cls(req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
+    
     def make(self) -> bytes:
         body = b""
         

core/adb_handlers/felica.py

@@ -13,7 +13,13 @@ class ADBFelicaLookupResponse(ADBBaseResponse):
     def __init__(self, access_code: str = None, game_id: str = "SXXX", store_id: int = 1, keychip_id: str = "A69E01A8888", code: int = 0x03, length: int = 0x30, status: int = 1) -> None:
         super().__init__(code, length, status, game_id, store_id, keychip_id)
         self.access_code = access_code if access_code is not None else "00000000000000000000"
-
+    
+    @classmethod
+    def from_req(cls, req: ADBHeader, access_code: str = None) -> "ADBFelicaLookupResponse":
+        c = cls(access_code, req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
+    
     def make(self) -> bytes:        
         resp_struct = Struct(
             "felica_idx" / Int32ul,
@@ -47,6 +53,12 @@ class ADBFelicaLookup2Response(ADBBaseResponse):
         self.company = CompanyCodes.SEGA
         self.portal_status = PortalRegStatus.NO_REG
 
+    @classmethod
+    def from_req(cls, req: ADBHeader, user_id: Union[int, None] = None, access_code: Union[str, None] = None) -> "ADBFelicaLookup2Response":
+        c = cls(user_id, access_code, req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
+
     def make(self) -> bytes:        
         resp_struct = Struct(
             "user_id" / Int32sl,

core/adb_handlers/lookup.py

@@ -19,13 +19,18 @@ class ADBLookupRequest(ADBBaseRequest):
         
         self.fw_version = ReaderFwVer.from_byte(fw_version)
 
-
 class ADBLookupResponse(ADBBaseResponse):
     def __init__(self, user_id: Union[int, None], game_id: str = "SXXX", store_id: int = 1, keychip_id: str = "A69E01A8888", code: int = 0x06, length: int = 0x30, status: int = 1) -> None:
         super().__init__(code, length, status, game_id, store_id, keychip_id)
         self.user_id = user_id if user_id is not None else -1
         self.portal_reg = PortalRegStatus.NO_REG
 
+    @classmethod
+    def from_req(cls, req: ADBHeader, user_id: Union[int, None]) -> "ADBLookupResponse":
+        c = cls(user_id, req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
+
     def make(self):
         resp_struct = Struct(
             "user_id" / Int32sl,
@@ -48,6 +53,12 @@ class ADBLookupExResponse(ADBBaseResponse):
         self.user_id = user_id if user_id is not None else -1
         self.portal_reg = PortalRegStatus.NO_REG
 
+    @classmethod
+    def from_req(cls, req: ADBHeader, user_id: Union[int, None]) -> "ADBLookupExResponse":
+        c = cls(user_id, req.game_id, req.store_id, req.keychip_id)
+        c.head.protocol_ver = req.protocol_ver
+        return c
+
     def make(self):
         resp_struct = Struct(
             "user_id" / Int32sl,