albibong 1.0.6__py3-none-any.whl → 1.0.7__py3-none-any.whl

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/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/classes/location.py

@@ -13,34 +13,6 @@ class Location:
         self.name = name
         self.type = type
 
-    def is_black_zone(self):
-        if self.type == "OPENPVP_BLACK":
-            return True
-        elif self.type == "DUNGEON_BLACK":
-            return True
-        elif self.type == "PASSAGE_BLACK":
-            return True
-        elif self.type == "TUNNEL":
-            return True
-        else:
-            return False
-
-    def is_red_zone(self):
-        if self.type == "OPENPVP_RED":
-            return True
-        elif self.type == "DUNGEON_RED":
-            return True
-        elif self.type == "PASSAGE_RED":
-            return True
-        else:
-            return False
-
-    def is_safe_zone(self):
-        if self.is_black_zone() == False and self.is_red_zone() == False:
-            return True
-        else:
-            return False
-
     @classmethod
     def get_location_from_code(cls, code: str):
         location = map_data[code]