🔀 Refactor class MemberOffset650 and MemberOffset to use a size varia…

…ble instead of hardcoded size values
RedAsteroid · Oct 7, 2023 · 4d9649b · 4d9649b
1 parent fd71991
commit 4d9649b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ff_draw/mem/party.py b/ff_draw/mem/party.py
@@ -25,6 +25,8 @@ class MemberOffset:
     level = 0x206
     shield = 0x207
 
+    size_ = 0X230
+
 
 class MemberOffset650:
     status = 0x0
@@ -39,6 +41,8 @@ class MemberOffset650:
     level = 0x366
     shield = 0x367
 
+    size_ = 0X390
+
 
 class Member:
     offsets = MemberOffset
@@ -94,7 +98,7 @@ class Party:
     def __init__(self, handle, address):
         self.handle = handle
         self.address = address
-        self.members = [Member(self.handle, self.address + self.offsets.members + i * 0x230) for i in range(28)]
+        self.members = [Member(self.handle, self.address + self.offsets.members + i * Member.offsets.size_) for i in range(28)]
 
     def __iter__(self):
         for i in range(self.party_size):
@@ -115,13 +119,12 @@ def __init__(self, main: 'XivMem'):
         self.main = main
         real_party_address = main.scanner.find_point('48 ? ? * * * * 48 89 74 24 ? b2')[0]
         replay_party_address = real_party_address + main.scanner.find_val('74 ? f6 05 ? ? ? ? ? 48 ? ? * * * * 75')[0]
-        self.real_party = Party(self.main.handle, real_party_address)
-        self.replay_party = Party(self.main.handle, replay_party_address)
-
         if main.game_version >= (6, 5, 0):
             Member.offsets = MemberOffset650
         else:
             Member.offsets = MemberOffset
+        self.real_party = Party(self.main.handle, real_party_address)
+        self.replay_party = Party(self.main.handle, replay_party_address)
 
     @property
     def party_list(self):