albibong 1.0.2__tar.gz → 1.0.3__tar.gz

{albibong-1.0.2 → albibong-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: albibong
-Version: 1.0.2
+Version: 1.0.3
 Summary: A cross-platform Albion Online damage, fame, and dungeon tracker
 Project-URL: Homepage, https://github.com/imjangkar/albibong
 Project-URL: Issues, https://github.com/imjangkar/albibong/issues

{albibong-1.0.2 → albibong-1.0.3}/pyproject.toml

@@ -19,7 +19,7 @@ albibong = "albibong:main"
 
 [project]
 name = "albibong"
-version = "1.0.2"
+version = "1.0.3"
 authors = [
   { name="imjangkar", email="imjangkar@gmail.com" },
 ]

{albibong-1.0.2 → albibong-1.0.3}/src/albibong/classes/world_data.py

@@ -43,8 +43,6 @@ class WorldData:
                 self.handle_join_response(parameters)
             elif parameters[253] == OperationCode.CHANGE_CLUSTER.value:
                 self.set_location(parameters)
-            # elif parameters[253] == OperationCode.PARTY_LEAVE.value:
-            #     self.party_members = set(self.me.username)
 
     def handle_event(self, parameters):
         if 252 in parameters:
@@ -169,7 +167,7 @@ class WorldData:
         if parameters[252] == EventCode.PARTY_JOINED.value:
             self.party_members = set(parameters[5])
         elif parameters[252] == EventCode.PARTY_DISBANDED.value:
-            self.party_members = set()
+            self.party_members = {self.me.username}
         elif parameters[252] == EventCode.PARTY_PLAYER_JOINED.value:
             self.party_members.add(parameters[2])
         elif parameters[252] == EventCode.PARTY_PLAYER_LEFT.value:
@@ -177,9 +175,7 @@ class WorldData:
             if uuid in self.char_uuid_to_username:
                 name = self.char_uuid_to_username[uuid]
                 if name == self.me.username:
-                    self.party_members = set()
-        if self.me.id != None:
-            self.party_members.add(self.me.username)
+                    self.party_members = {self.me.username}
         event = {
             "type": "update_dps",
             "payload": {"party_members": self.serialize_party_members()},
@@ -217,18 +213,21 @@ class WorldData:
 
     def handle_join_response(self, parameters):
         # set my character
-
         self.convert_id_to_name(old_id=self.me.id, new_id=parameters[0], char=self.me)
-
         self.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
         self.me.username = parameters[2]
         self.me.guild = parameters[57] if 57 in parameters else ""
         self.me.alliance = parameters[77] if 77 in parameters else ""
-        self.characters[self.me.username] = self.me
-        self.char_uuid_to_username[self.me.uuid] = self.me.username
         if self.me.id in self.change_equipment_log:
             self.me.update_equipment(self.change_equipment_log[self.me.id])
 
+        # put self in characters list
+        self.characters[self.me.username] = self.me
+        self.char_uuid_to_username[self.me.uuid] = self.me.username
+
+        # put self in party
+        self.party_members.add(self.me.username)
+
         # set map my character is currently in
         if parameters[8][0] == "@":
             area = parameters[8].split("@")
@@ -257,8 +256,13 @@ class WorldData:
                 ),
             },
         }
+        event_party = {
+            "type": "update_dps",
+            "payload": {"party_members": self.serialize_party_members()},
+        }
         send_event(event_map)
         send_event(event_char)
+        send_event(event_party)
 
     def convert_id_to_name(self, old_id, new_id, char: Character):
         if old_id in self.char_id_to_username:
@@ -304,32 +308,54 @@ class WorldData:
 
         total_damage = 0
         total_heal = 0
+
+        # get total damage and heal for percentage
         for key, value in self.characters.items():
             if key in self.party_members:
                 total_damage += value.damage_dealt
                 total_heal += value.healing_dealt
 
-        for key, value in self.characters.items():
-            if key in self.party_members:
-                if value.equipment != []:
-                    weapon = Item.serialize(value.equipment[0])["image"]
-                    data = {
-                        "username": value.username,
-                        "damage_dealt": value.damage_dealt,
-                        "damage_percent": (
-                            round(value.damage_dealt / total_damage * 100, 2)
-                            if total_damage > 0
-                            else 0
-                        ),
-                        "healing_dealt": value.healing_dealt,
-                        "heal_percent": (
-                            round(value.healing_dealt / total_heal * 100, 2)
-                            if total_heal > 0
-                            else 0
-                        ),
-                        "weapon": weapon,
-                    }
-                    serialized.append(data)
+        for member in self.party_members:
+            # member character initialized
+            if member in self.characters:
+                char = self.characters[member]
+                username = char.username
+                damage_dealt = char.damage_dealt
+                damage_percent = (
+                    round(char.damage_dealt / total_damage * 100, 2)
+                    if total_damage > 0
+                    else 0
+                )
+                healing_dealt = char.healing_dealt
+                heal_percent = (
+                    round(char.healing_dealt / total_heal * 100, 2)
+                    if total_heal > 0
+                    else 0
+                )
+                weapon = (
+                    Item.serialize(char.equipment[0])["image"]
+                    if char.equipment != []
+                    else "../public/No Equipment.png"
+                )
+
+            # member character not initialized
+            else:
+                username = member
+                damage_dealt = 0
+                damage_percent = 0
+                healing_dealt = 0
+                heal_percent = 0
+                weapon = "../public/No Equipment.png"
+
+            data = {
+                "username": username,
+                "damage_dealt": damage_dealt,
+                "damage_percent": damage_percent,
+                "healing_dealt": healing_dealt,
+                "heal_percent": heal_percent,
+                "weapon": weapon,
+            }
+            serialized.append(data)
         serialized.sort(key=lambda x: x["damage_dealt"], reverse=True)
         return serialized