src/ccsaveparser.py

@@ -1,15 +1,9 @@
 import struct
 
-# BUG: I am dumb and used struct.pack to read values like a moron
-# need to move to using struct.unpack and loading the size from the
-# save file to make sure the entire label is retrieved
-# Format for structure in notes.md
-
 
 class OFFSETS:
     VERSION = 0x42e
-    KEYS_LABEL = 0x12DB
-    KEYS_VALUE = 0x12F9
+    KEYS = 0x12DB
     ACCOUNT_LEVEL = 0x12AD
 
 
@@ -26,22 +20,13 @@ def load_save(save_file_name):
         print(f"Failed to read save file: {e}")
 
 
-def get_key_value(save):
-    try:
-        data = struct.pack(">i", save[OFFSETS.KEYS_VALUE])
-        return data
-    except struct.error as e:
-        print(f"{e}")
-
-
 def verify_save(save):
     try:
         struct.pack("bbbb", *save[:4]) == b"GVAS"
         token = _bytes_to_string(read_token_at_offset(save, OFFSETS.VERSION))
         if token == "CrabChampionsVersion":
             return True
-    except struct.error as e:
-        print(f"{e}")
+    except struct.error:
         return False
 
 
@@ -59,7 +44,7 @@ def read_token_at_offset(save, offset, size=1):
 save = load_save("./test.sav")
 
 if verify_save(save):
-    print("Save is a valid Crab Champions save")
+    print("Save appears to be a save file of some kind")
 else:
     print("The fuck is this shit mate")
     exit()
@@ -68,6 +53,5 @@ else:
 # Should be fine to do shit here
 # print(read_token_at_offset(save, 0x12DB))  # Keys
 # print(read_token_at_offset(save, 0x12AD))  # AccountLevel
-token = read_token_at_offset(save, OFFSETS.KEYS_LABEL)
-# print(_bytes_to_string(token))
-print(f"You have {int.from_bytes(get_key_value(save))} keys")
+token = read_token_at_offset(save, OFFSETS.KEYS)
+print(_bytes_to_string(token))