albibong 1.0.3__py3-none-any.whl → 1.0.5__py3-none-any.whl

albibong/classes/packet_handler.py

@@ -3,8 +3,9 @@ import traceback
 
 from scapy.all import UDP, Packet
 
+from albibong.classes.event_handler import EventHandler
 from albibong.classes.logger import Logger
-from albibong.classes.world_data import WorldData, get_world_data
+from albibong.classes.world_data import get_world_data
 from albibong.photon_packet_parser import (
     EventData,
     OperationRequest,
@@ -33,20 +34,21 @@ class PacketHandler:
             self.on_event, self.on_request, self.on_response
         )
         self.world_data = get_world_data()
+        self.event_handler = EventHandler()
 
     @log_payload
     def on_event(self, payload: EventData):
-        self.world_data.handle_event(payload.parameters)
+        self.event_handler.on_event(self.world_data, payload.parameters)
         return payload
 
     @log_payload
     def on_request(self, payload: OperationRequest):
-        self.world_data.handle_request(payload.parameters)
+        self.event_handler.on_request(self.world_data, payload.parameters)
         return payload
 
     @log_payload
     def on_response(self, payload: OperationResponse):
-        self.world_data.handle_response(payload.parameters)
+        self.event_handler.on_response(self.world_data, payload.parameters)
         return payload
 
     def handle(self, packet: Packet):

albibong/classes/world_data.py

@@ -1,6 +1,3 @@
-import json
-import os
-from collections import deque
 from uuid import UUID
 
 from albibong.classes.character import Character
@@ -8,13 +5,6 @@ from albibong.classes.coords import Coords
 from albibong.classes.dungeon import Dungeon
 from albibong.classes.item import Item
 from albibong.classes.location import Location
-from albibong.classes.utils import Utils
-from albibong.resources.EventCode import EventCode
-from albibong.resources.OperationCode import OperationCode
-from albibong.threads.websocket_server import send_event
-
-FILENAME = os.path.join(os.path.expanduser("~"), "Albibong/list_dungeon.json")
-os.makedirs(os.path.dirname(FILENAME), exist_ok=True)
 
 
 class WorldData:
@@ -37,272 +27,6 @@ class WorldData:
         self.party_members: set[str] = set()
         self.is_dps_meter_running: bool = True
 
-    def handle_response(self, parameters):
-        if 253 in parameters:
-            if parameters[253] == OperationCode.JOIN.value:
-                self.handle_join_response(parameters)
-            elif parameters[253] == OperationCode.CHANGE_CLUSTER.value:
-                self.set_location(parameters)
-
-    def handle_event(self, parameters):
-        if 252 in parameters:
-            if parameters[252] == EventCode.OTHER_GRABBED_LOOT.value:
-                if 2 in parameters and parameters[2] in self.characters:
-                    char: Character = self.characters[parameters[2]]
-                    char.update_loot(parameters)
-                if self.current_dungeon and parameters[2] == self.me.username:
-                    self.current_dungeon.update_loot(parameters)
-            elif parameters[252] == EventCode.UPDATE_FAME.value:
-                self.me.update_fame(parameters)
-                if self.current_dungeon:
-                    self.current_dungeon.update_fame(parameters)
-            elif parameters[252] == EventCode.UPDATE_RE_SPEC_POINTS.value:
-                self.me.update_re_spec(parameters)
-                if self.current_dungeon:
-                    self.current_dungeon.update_re_spec(parameters)
-            elif parameters[252] == EventCode.CHARACTER_EQUIPMENT_CHANGED.value:
-                self.change_character_equipment(parameters)
-            elif (
-                parameters[252] == EventCode.HEALTH_UPDATE.value
-                and self.is_dps_meter_running
-            ):
-                self.update_dps_meter(parameters)
-            elif (
-                parameters[252] == EventCode.PARTY_JOINED.value
-                or parameters[252] == EventCode.PARTY_PLAYER_JOINED.value
-                or parameters[252] == EventCode.PARTY_PLAYER_LEFT.value
-                or parameters[252] == EventCode.PARTY_DISBANDED.value
-            ):
-                self.update_party_member(parameters)
-            elif parameters[252] == EventCode.NEW_CHARACTER.value:
-                self.create_character(
-                    id=parameters[0],
-                    uuid=parameters[7],
-                    username=parameters[1],
-                    guild=parameters[8] if 8 in parameters else "",
-                    alliance=parameters[49] if 49 in parameters else "",
-                    coords=(
-                        Coords(parameters[15][0], parameters[15][1])
-                        if 15 in parameters
-                        else Coords(0, 0)
-                    ),
-                    equipments=parameters[38] if 38 in parameters else [],
-                )
-        ...
-
-    def handle_request(self, parameters):
-        if 253 in parameters:
-            if parameters[253] == OperationCode.MOVE.value and self.me:
-                self.me.update_coords(parameters)
-        ...
-
-    def end_current_dungeon(self):
-        if self.current_dungeon:
-            list_dungeon = deque()
-
-            try:
-                with open(FILENAME) as json_file:
-                    list_dungeon = deque(json.load(json_file))
-            except:
-                pass
-
-            self.current_dungeon.get_elapsed_time()
-            list_dungeon.appendleft(Dungeon.serialize(self.current_dungeon))
-
-            with open(FILENAME, "w") as json_file:
-                json.dump(list(list_dungeon), json_file)
-
-            event = {
-                "type": "update_dungeon",
-                "payload": {"list_dungeon": list(list_dungeon)},
-            }
-            send_event(event)
-            self.current_dungeon = None
-
-    def start_current_dungeon(self, type, name):
-        if self.current_dungeon == None:
-            new_dungeon = Dungeon(type, name)
-            self.current_dungeon = new_dungeon
-
-    def set_dungeon_status(self, check_map, map_type_splitted):
-        if "EXPEDITION" in map_type_splitted or "DUNGEON" in map_type_splitted:
-            self.start_current_dungeon(type=check_map.type, name=check_map.name)
-        elif (
-            "EXPEDITION" not in map_type_splitted or "DUNGEON" not in map_type_splitted
-        ):
-            self.end_current_dungeon()
-            return False
-
-    def set_location(self, parameters):
-        self.change_equipment_log = {}
-
-        if 1 in parameters:
-            check_map = Location.get_location_from_code(parameters[1])
-            map_type_splitted = set(check_map.type.split("_"))
-            self.set_dungeon_status(check_map, map_type_splitted)
-
-            if "ISLAND" in map_type_splitted or "HIDEOUT" in map_type_splitted:
-                check_map.name = f"{parameters[2]}'s {check_map.name}"
-                self.current_map = check_map
-
-        elif 0 in parameters:
-            check_map = Location.get_location_from_code(parameters[0])
-            map_type_splitted = set(check_map.type.split("_"))
-            is_dungeon = self.set_dungeon_status(check_map, map_type_splitted)
-            if is_dungeon == False:
-                self.current_map = Location.get_location_from_code(parameters[0])
-
-        event = {
-            "type": "update_location",
-            "payload": {
-                "map": self.current_map.name if self.current_map else "None",
-                "dungeon": (
-                    self.current_dungeon.name if self.current_dungeon else "None"
-                ),
-            },
-        }
-        send_event(event)
-
-    def update_party_member(self, parameters):
-        if parameters[252] == EventCode.PARTY_JOINED.value:
-            self.party_members = set(parameters[5])
-        elif parameters[252] == EventCode.PARTY_DISBANDED.value:
-            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:
-            uuid = UUID(bytes=bytes(parameters[1]))
-            if uuid in self.char_uuid_to_username:
-                name = self.char_uuid_to_username[uuid]
-                if name == self.me.username:
-                    self.party_members = {self.me.username}
-        event = {
-            "type": "update_dps",
-            "payload": {"party_members": self.serialize_party_members()},
-        }
-        send_event(event)
-
-    def update_dps_meter(self, parameters):
-        if 6 in parameters and parameters[6] in self.char_id_to_username:
-            username = self.char_id_to_username[parameters[6]]
-            if username in self.party_members:
-                char: Character = self.characters[username]
-                char.handle_health_update(parameters)
-                event = {
-                    "type": "update_dps",
-                    "payload": {"party_members": self.serialize_party_members()},
-                }
-                send_event(event)
-
-    def change_character_equipment(self, parameters):
-        if 2 in parameters:
-            if parameters[0] in self.char_id_to_username:
-                if self.char_id_to_username[parameters[0]] != "not initialized":
-                    char = self.characters[self.char_id_to_username[parameters[0]]]
-                    if char.username in self.party_members:
-                        char.update_equipment(parameters[2])
-                        event = {
-                            "type": "update_dps",
-                            "payload": {
-                                "party_members": self.serialize_party_members()
-                            },
-                        }
-                        send_event(event)
-            else:
-                self.change_equipment_log[parameters[0]] = parameters[2]
-
-    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 ""
-        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("@")
-            if area[1] == "RANDOMDUNGEON":
-                check_map = Location.get_location_from_code(area[1])
-                self.start_current_dungeon(type=check_map.type, name=check_map.name)
-
-        event_char = {
-            "type": "init_character",
-            "payload": {
-                "username": self.me.username,
-                "fame": self.me.fame_gained,
-                "re_spec": self.me.re_spec_gained,
-                "silver": self.me.silver_gained,
-                "weapon": self.me.equipment[0].image,
-            },
-        }
-        event_map = {
-            "type": "update_location",
-            "payload": {
-                "map": self.current_map.name if self.current_map else "None",
-                "dungeon": (
-                    Dungeon.serialize(self.current_dungeon)
-                    if self.current_dungeon
-                    else None
-                ),
-            },
-        }
-        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:
-            self.char_id_to_username.pop(old_id)  # delete old relative id
-        char.id = new_id
-        self.char_id_to_username[char.id] = char.username  # add new relative id
-
-    def create_character(
-        self,
-        id: int,
-        uuid: list[int],
-        username: str,
-        guild: str,
-        alliance: str,
-        equipments: list[str] = [],
-        coords: Coords = Coords(0, 0),
-    ):
-
-        # initiate character
-        if username not in self.characters:
-            char: Character = Character(
-                id=id,
-                uuid=Utils.convert_int_arr_to_uuid(uuid),
-                username=username,
-                guild=guild,
-                alliance=alliance,
-                coords=coords,
-            )
-            char.update_equipment(equipments)
-            self.characters[char.username] = char
-            self.char_id_to_username[char.id] = char.username
-            self.char_uuid_to_username[char.uuid] = char.username
-
-        # change map
-        else:
-            char: Character = self.characters[username]
-            char.update_equipment(equipments)
-            char.coords = coords
-            self.convert_id_to_name(old_id=char.id, new_id=id, char=char)
-
     def serialize_party_members(self):
         serialized = []
 
@@ -332,10 +56,18 @@ class WorldData:
                     if total_heal > 0
                     else 0
                 )
+                duration = char.total_combat_duration
+
+                combat_duration = str(duration).split(".")[0]
+                dps = (
+                    damage_dealt // duration.total_seconds()
+                    if duration.total_seconds() != 0
+                    else 0
+                )
                 weapon = (
                     Item.serialize(char.equipment[0])["image"]
                     if char.equipment != []
-                    else "../public/No Equipment.png"
+                    else "/No Equipment.png"
                 )
 
             # member character not initialized
@@ -345,7 +77,9 @@ class WorldData:
                 damage_percent = 0
                 healing_dealt = 0
                 heal_percent = 0
-                weapon = "../public/No Equipment.png"
+                combat_duration = 0
+                dps = 0
+                weapon = "/No Equipment.png"
 
             data = {
                 "username": username,
@@ -353,6 +87,8 @@ class WorldData:
                 "damage_percent": damage_percent,
                 "healing_dealt": healing_dealt,
                 "heal_percent": heal_percent,
+                "combat_duration": combat_duration,
+                "dps": dps,
                 "weapon": weapon,
             }
             serialized.append(data)

albibong/gui_dist/assets/{index-BFSx0nua.css → index-DZvgNqlG.css}

@@ -1 +1 @@
-*{box-sizing:border-box}:root{font-family:Inter,system-ui,Avenir,Helvetica,Arial,sans-serif;line-height:1.5;font-weight:400;color-scheme:light dark;color:#ffffffde;font-synthesis:none;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}p{margin:0}a{font-weight:500;color:#646cff;text-decoration:inherit}a:hover{color:#535bf2}#root,body{margin:auto;display:flex;flex-direction:column;justify-content:start;align-items:center;min-width:320px;min-height:100vh;color:#fff;width:100%}h1{font-size:2em;line-height:1}button{border-radius:8px;border:1px solid transparent;padding:.6em 1.2em;font-size:1em;font-weight:500;font-family:inherit;background-color:#1a1a1a;cursor:pointer;transition:border-color .25s}button:hover{border-color:#646cff}button:focus,button:focus-visible{outline:4px auto -webkit-focus-ring-color}@media (prefers-color-scheme: light){:root{color:#213547;background-color:#fff}a:hover{color:#747bff}button{background-color:#f9f9f9}}._dmgBar_zdqdf_1{background:linear-gradient(135deg,#ff6486,#6486ff);height:6px;border-radius:8px;margin-bottom:2px}._healBar_zdqdf_8{background:linear-gradient(135deg,#64ffde,#64ff90);height:2px;border-radius:4px}._dpsContainer_zdqdf_14{display:flex;flex-direction:column;justify-content:flex-start;width:100%;gap:4px;box-sizing:content-box;padding:16px}._dpsRow_zdqdf_24{display:flex;flex-direction:row;justify-content:space-between;align-items:center}._dpsNumber_zdqdf_31{width:128px;text-align:right}._hidden_zdqdf_36{display:none}._player_zdqdf_40{flex-grow:1}._checkboxColor_zdqdf_44{accent-color:#64d3ff}._container_pkz1i_1{display:flex;flex-direction:column;align-items:center;gap:8px;width:100%;gap:1.5rem}._snackbar_pkz1i_10{position:fixed;right:64px}._stats_pkz1i_15{display:flex;flex-direction:row;align-items:center;gap:.5rem}._options_pkz1i_22{display:flex;flex-direction:row;align-items:center;gap:2rem}._row_pkz1i_29{display:flex;width:100%;justify-content:space-between}._hidden_pkz1i_35{display:none}._dungeonContainer_mlu2u_1{border-radius:1rem;width:100%;padding:2rem;display:flex;flex-direction:column;gap:1rem}._tag_mlu2u_12{background-color:#64d3ff;padding:0 1rem;border-radius:1rem;color:#0f3c4e;font-weight:700}
+*{box-sizing:border-box}:root{font-family:Inter,system-ui,Avenir,Helvetica,Arial,sans-serif;line-height:1.5;font-weight:400;color-scheme:light dark;color:#ffffffde;font-synthesis:none;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}p{margin:0}a{font-weight:500;color:#646cff;text-decoration:inherit}a:hover{color:#535bf2}#root,body{margin:auto;display:flex;flex-direction:column;justify-content:start;align-items:center;min-width:320px;min-height:100vh;color:#fff;width:100%}h1{font-size:2em;line-height:1}button{border-radius:8px;border:1px solid transparent;padding:.6em 1.2em;font-size:1em;font-weight:500;font-family:inherit;background-color:#1a1a1a;cursor:pointer;transition:border-color .25s}button:hover{border-color:#646cff}button:focus,button:focus-visible{outline:4px auto -webkit-focus-ring-color}@media (prefers-color-scheme: light){:root{color:#213547;background-color:#fff}a:hover{color:#747bff}button{background-color:#f9f9f9}}._dmgBar_zdqdf_1{background:linear-gradient(135deg,#ff6486,#6486ff);height:6px;border-radius:8px;margin-bottom:2px}._healBar_zdqdf_8{background:linear-gradient(135deg,#64ffde,#64ff90);height:2px;border-radius:4px}._dpsContainer_zdqdf_14{display:flex;flex-direction:column;justify-content:flex-start;width:100%;gap:4px;box-sizing:content-box;padding:16px}._dpsRow_zdqdf_24{display:flex;flex-direction:row;justify-content:space-between;align-items:center}._dpsNumber_zdqdf_31{width:128px;text-align:right}._hidden_zdqdf_36{display:none}._player_zdqdf_40{flex-grow:1}._checkboxColor_zdqdf_44{accent-color:#64d3ff}._dungeonContainer_3nxyx_1{border-radius:1rem;width:100%;padding:2rem;display:flex;flex-direction:column;gap:1rem}._tag_3nxyx_12{background-color:#64d3ff;padding:0 1rem;border-radius:1rem;color:#0f3c4e;font-weight:700}._stickToTop_3nxyx_20{z-index:10;position:sticky;top:64px;left:0;width:100%;padding:24px 0}._container_pkz1i_1{display:flex;flex-direction:column;align-items:center;gap:8px;width:100%;gap:1.5rem}._snackbar_pkz1i_10{position:fixed;right:64px}._stats_pkz1i_15{display:flex;flex-direction:row;align-items:center;gap:.5rem}._options_pkz1i_22{display:flex;flex-direction:row;align-items:center;gap:2rem}._row_pkz1i_29{display:flex;width:100%;justify-content:space-between}._hidden_pkz1i_35{display:none}