albibong 1.0.5__tar.gz → 1.0.7__tar.gz

{albibong-1.0.5 → albibong-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: albibong
-Version: 1.0.5
+Version: 1.0.7
 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
@@ -10,7 +10,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: playsound==1.3.0
 Requires-Dist: pywebview==5.1
 Requires-Dist: scapy==2.5.0
 Requires-Dist: websockets==12.0

{albibong-1.0.5 → albibong-1.0.7}/pyproject.toml

@@ -19,7 +19,7 @@ albibong = "albibong:main"
 
 [project]
 name = "albibong"
-version = "1.0.5"
+version = "1.0.7"
 authors = [
   { name="imjangkar", email="imjangkar@gmail.com" },
 ]
@@ -34,7 +34,6 @@ dependencies = [
   "scapy==2.5.0",
   "websockets==12.0",
   "pywebview==5.1",
-  "playsound==1.3.0"
 ]
 
 [project.urls]

{albibong-1.0.5 → albibong-1.0.7}/src/albibong/classes/character.py

@@ -71,7 +71,7 @@ class Character:
         self.fame_gained += fame
         event = {
             "type": "update_fame",
-            "payload": {"username": self.username, "fame_gained": fame},
+            "payload": {"username": self.username, "fame_gained": self.fame_gained},
         }
         send_event(event)
 
@@ -80,7 +80,10 @@ class Character:
         self.re_spec_gained += re_spec
         event = {
             "type": "update_re_spec",
-            "payload": {"username": self.username, "re_spec_gained": re_spec},
+            "payload": {
+                "username": self.username,
+                "re_spec_gained": self.re_spec_gained,
+            },
         }
         send_event(event)
 
@@ -91,7 +94,10 @@ class Character:
                 self.silver_gained += silver
                 event = {
                     "type": "update_silver",
-                    "payload": {"username": self.username, "silver_gained": silver},
+                    "payload": {
+                        "username": self.username,
+                        "silver_gained": self.silver_gained,
+                    },
                 }
                 send_event(event)
         else:

{albibong-1.0.5 → albibong-1.0.7}/src/albibong/classes/event_handler/handle_operation_join.py

@@ -7,10 +7,16 @@ from albibong.threads.websocket_server import send_event
 
 
 def handle_operation_join(world_data: WorldData, parameters):
+    # update relative id if character has initialized before
+    if world_data.me.username != "not initialized":
+        WorldDataUtils.convert_id_to_name(
+            world_data,
+            old_id=world_data.me.id,
+            new_id=parameters[0],
+            char=world_data.me,
+        )
+
     # set my character
-    WorldDataUtils.convert_id_to_name(
-        world_data, old_id=world_data.me.id, new_id=parameters[0], char=world_data.me
-    )
     world_data.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
     world_data.me.username = parameters[2]
     world_data.me.guild = parameters[57] if 57 in parameters else ""
@@ -30,7 +36,7 @@ def handle_operation_join(world_data: WorldData, parameters):
     # set map my character is currently in
     if parameters[8][0] == "@":
         area = parameters[8].split("@")
-        if area[1] == "RANDOMDUNGEON":
+        if area[1] == "RANDOMDUNGEON" or area[1] == "MISTS":
             check_map = Location.get_location_from_code(area[1])
             WorldDataUtils.start_current_dungeon(
                 world_data, type=check_map.type, name=check_map.name

{albibong-1.0.5 → albibong-1.0.7}/src/albibong/classes/event_handler/world_data_utils.py

@@ -52,10 +52,20 @@ class WorldDataUtils:
     def set_dungeon_status(
         world_data: WorldData, check_map: Location, map_type_splitted: set
     ):
-        if "EXPEDITION" in map_type_splitted or "DUNGEON" in map_type_splitted:
+        if "EXPEDITION" in map_type_splitted:
             WorldDataUtils.start_current_dungeon(
                 world_data, type=check_map.type, name=check_map.name
             )
+        elif "DUNGEON" in map_type_splitted:
+            WorldDataUtils.start_current_dungeon(
+                world_data,
+                type=check_map.type,
+                name=(
+                    f"{check_map.name} at {world_data.current_map.name}"
+                    if world_data.current_map
+                    else check_map.name
+                ),
+            )
         elif (
             "EXPEDITION" not in map_type_splitted or "DUNGEON" not in map_type_splitted
         ):

albibong-1.0.7/src/albibong/classes/location.py

@@ -0,0 +1,20 @@
+import json
+import os
+
+mapsJsonPath = os.path.join(os.path.dirname(__file__), "../resources/maps.json")
+with open(mapsJsonPath) as json_file:
+    map_data = json.load(json_file)
+
+
+class Location:
+
+    def __init__(self, id: str, name: str, type: str):
+        self.id = id
+        self.name = name
+        self.type = type
+
+    @classmethod
+    def get_location_from_code(cls, code: str):
+        location = map_data[code]
+
+        return cls(id=location["id"], name=location["name"], type=location["type"])

albibong-1.0.7/src/albibong/gui_dist/assets/index-Dt6hyZiS.css

@@ -0,0 +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_uvx94_1{background:linear-gradient(135deg,#ff6486,#6486ff);height:6px;border-radius:8px;margin-bottom:2px}._healBar_uvx94_8{background:linear-gradient(135deg,#64ffde,#64ff90);height:2px;border-radius:4px}._dpsContainer_uvx94_14{display:flex;flex-direction:column;justify-content:flex-start;width:100%;gap:4px;box-sizing:content-box;padding:16px}._dpsRow_uvx94_24{display:flex;flex-direction:row;justify-content:space-between;align-items:center}._dpsNumber_uvx94_31{width:128px;text-align:right}._dpsButton_uvx94_36{display:flex;flex-grow:1;gap:1rem}._hidden_uvx94_42{display:none}._player_uvx94_46{flex-grow:1}._checkboxColor_uvx94_50{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}