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

albibong/classes/event_handler/handle_operation_join.py

@@ -1,4 +1,3 @@
-from albibong.classes.dungeon import Dungeon
 from albibong.classes.event_handler.world_data_utils import WorldDataUtils
 from albibong.classes.location import Location
 from albibong.classes.utils import Utils
@@ -7,20 +6,20 @@ 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
-    world_data.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
     world_data.me.username = parameters[2]
+    world_data.me.uuid = Utils.convert_int_arr_to_uuid(parameters[1])
     world_data.me.guild = parameters[57] if 57 in parameters else ""
     world_data.me.alliance = parameters[77] if 77 in parameters else ""
+
+    # update relative id if character has initialized before
+    WorldDataUtils.convert_id_to_name(
+        world_data,
+        old_id=world_data.me.id,
+        new_id=parameters[0],
+        char=world_data.me,
+    )
+
     if world_data.me.id in world_data.change_equipment_log:
         world_data.me.update_equipment(
             world_data.change_equipment_log[world_data.me.id]
@@ -43,8 +42,8 @@ def handle_operation_join(world_data: WorldData, parameters):
             )
 
     ws_init_character(world_data)
-    ws_update_location(world_data)
-    ws_update_dps(world_data)
+    WorldDataUtils.ws_update_location(world_data)
+    WorldDataUtils.ws_update_damage_meter(world_data)
 
 
 def ws_init_character(world_data: WorldData):
@@ -55,30 +54,9 @@ def ws_init_character(world_data: WorldData):
             "fame": world_data.me.fame_gained,
             "re_spec": world_data.me.re_spec_gained,
             "silver": world_data.me.silver_gained,
+            "might": world_data.me.might_gained,
+            "favor": world_data.me.favor_gained,
             "weapon": world_data.me.equipment[0].image,
         },
     }
     send_event(event)
-
-
-def ws_update_location(world_data: WorldData):
-    event = {
-        "type": "update_location",
-        "payload": {
-            "map": world_data.current_map.name if world_data.current_map else "None",
-            "dungeon": (
-                Dungeon.serialize(world_data.current_dungeon)
-                if world_data.current_dungeon
-                else None
-            ),
-        },
-    }
-    send_event(event)
-
-
-def ws_update_dps(world_data: WorldData):
-    event = {
-        "type": "update_dps",
-        "payload": {"party_members": world_data.serialize_party_members()},
-    }
-    send_event(event)

albibong/classes/event_handler/world_data_utils.py

@@ -1,38 +1,54 @@
-from collections import deque
-import json
-import os
-
 from albibong.classes.character import Character
 from albibong.classes.dungeon import Dungeon
-from albibong.classes.location import Location
-from albibong.classes.utils import Utils
+from albibong.classes.location import Island, Location
 from albibong.classes.world_data import WorldData
 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 WorldDataUtils:
 
-    def end_current_dungeon(world_data: WorldData):
-        if world_data.current_dungeon:
-            list_dungeon = deque()
-
-            try:
-                with open(FILENAME) as json_file:
-                    list_dungeon = deque(json.load(json_file))
-            except:
-                pass
-
-            world_data.current_dungeon.get_elapsed_time()
-            list_dungeon.appendleft(Dungeon.serialize(world_data.current_dungeon))
-
-            with open(FILENAME, "w") as json_file:
-                json.dump(list(list_dungeon), json_file)
+    def save_current_island(current_map: Island):
+        current_map.save(force_insert=True)
+        WorldDataUtils.ws_update_total_harvest_by_date(
+            Island.get_total_harvest_by_date()
+        )
+        WorldDataUtils.ws_update_island(Island.get_all_island())
+
+    def set_island_status(current_island: Island, parameters):
+        check_map = (
+            Location.get_location_from_code(parameters[1])
+            if 1 in parameters
+            else Location.get_location_from_code(parameters[0])
+        )
+        check_map_name = (
+            f"{parameters[2]}'s {check_map.name}" if 2 in parameters else check_map.name
+        )
+        if current_island.name != check_map_name:
+            if current_island.crops != {} or current_island.animals != {}:
+                WorldDataUtils.save_current_island(current_island)
+
+    def ws_update_total_harvest_by_date(payload):
+        event = {
+            "type": "update_total_harvest_by_date",
+            "payload": payload,
+        }
+        send_event(event)
 
-            WorldDataUtils.ws_update_dungeon(list(list_dungeon))
+    def ws_update_island(list_island: list):
+        event = {
+            "type": "update_island",
+            "payload": {"list_island": list_island},
+        }
+        send_event(event)
 
+    def end_current_dungeon(world_data: WorldData):
+        if world_data.current_dungeon:
+            world_data.current_dungeon.set_end_time()
+            world_data.current_dungeon.update_meter(
+                world_data.serialize_party_members()
+            )
+            world_data.current_dungeon.save(force_insert=True)
+            WorldDataUtils.ws_update_dungeon(Dungeon.get_all_dungeon())
             world_data.current_dungeon = None
 
     def ws_update_dungeon(list_dungeon: list):
@@ -45,14 +61,14 @@ class WorldDataUtils:
     @staticmethod
     def start_current_dungeon(world_data: WorldData, type: str, name: str):
         if world_data.current_dungeon == None:
-            new_dungeon = Dungeon(type, name)
+            new_dungeon = Dungeon(type=type, name=name)
             world_data.current_dungeon = new_dungeon
 
     @staticmethod
     def set_dungeon_status(
         world_data: WorldData, check_map: Location, map_type_splitted: set
     ):
-        if "EXPEDITION" in map_type_splitted:
+        if "EXPEDITION" in map_type_splitted or "HELLGATE" in map_type_splitted:
             WorldDataUtils.start_current_dungeon(
                 world_data, type=check_map.type, name=check_map.name
             )
@@ -102,11 +118,27 @@ class WorldDataUtils:
         else:
             char.update_heal_dealt(nominal)
 
-        WorldDataUtils.ws_update_damage_heal(world_data)
+        WorldDataUtils.ws_update_damage_meter(world_data)
 
-    def ws_update_damage_heal(world_data: WorldData):
+    def ws_update_damage_meter(world_data: WorldData):
         event = {
-            "type": "update_dps",
+            "type": "update_damage_meter",
             "payload": {"party_members": world_data.serialize_party_members()},
         }
         send_event(event)
+
+    def ws_update_location(world_data: WorldData):
+        event = {
+            "type": "update_location",
+            "payload": {
+                "map": (
+                    world_data.current_map.name if world_data.current_map else "None"
+                ),
+                "dungeon": (
+                    world_data.current_dungeon.name
+                    if world_data.current_dungeon
+                    else "None"
+                ),
+            },
+        }
+        send_event(event)

albibong/classes/item.py

@@ -1,9 +1,16 @@
 import json
 import os
 
-itemsJsonPath = os.path.join(os.path.dirname(__file__), "../resources/items.json")
-with open(itemsJsonPath) as json_file:
-    item_data = json.load(json_file)
+itemsByIdJsonPath = os.path.join(
+    os.path.dirname(__file__), "../resources/items_by_id.json"
+)
+itemsByUniqueNameJsonPath = os.path.join(
+    os.path.dirname(__file__), "../resources/items_by_unique_name.json"
+)
+with open(itemsByIdJsonPath) as json_file:
+    items_by_id = json.load(json_file)
+with open(itemsByUniqueNameJsonPath) as json_file:
+    items_by_unique_name = json.load(json_file)
 
 
 class Item:
@@ -17,6 +24,7 @@ class Item:
             if self.unique_name != "None"
             else "/No Equipment.png"
         )
+        self.quantity = 0
 
     @staticmethod
     def serialize(item):
@@ -25,6 +33,7 @@ class Item:
             "name": item.name,
             "unique_name": item.unique_name,
             "image": item.image,
+            "quantity": item.quantity,
         }
 
     @staticmethod
@@ -36,6 +45,12 @@ class Item:
 
     @classmethod
     def get_item_from_code(cls, code: str):
-        item = item_data[code]
+        item = items_by_id[code]
+
+        return cls(id=item["id"], name=item["name"], unique_name=item["unique_name"])
+
+    @classmethod
+    def get_item_from_unique_name(cls, unique_name: str):
+        item = items_by_unique_name[unique_name]
 
         return cls(id=item["id"], name=item["name"], unique_name=item["unique_name"])

albibong/classes/location.py

@@ -1,20 +1,151 @@
 import json
 import os
+import stat
+import uuid
+from datetime import date, datetime, timedelta
+
+from peewee import CharField, DateTimeField, UUIDField, fn
+from playhouse.sqlite_ext import JSONField
+
+from albibong.classes.dungeon import Dungeon
+from albibong.classes.item import Item
+from albibong.models.models import BaseModel
 
 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:
+class Location(BaseModel):
 
-    def __init__(self, id: str, name: str, type: str):
-        self.id = id
-        self.name = name
-        self.type = type
+    uuid = UUIDField(unique=True, default=uuid.uuid4)
+    id = CharField()
+    name = CharField()
+    type = CharField()
 
     @classmethod
     def get_location_from_code(cls, code: str):
         location = map_data[code]
 
         return cls(id=location["id"], name=location["name"], type=location["type"])
+
+
+class Island(Location, BaseModel):
+
+    uuid = UUIDField(unique=True, default=uuid.uuid4)
+    id = CharField()
+    name = CharField()
+    type = CharField()
+    start_time = DateTimeField(default=datetime.now)
+    crops = JSONField(default=dict)
+    animals = JSONField(default=dict)
+
+    def add_crop(self, unique_name, quantity):
+        crop = Item.get_item_from_unique_name(unique_name)
+
+        if crop.name not in self.crops:
+            self.crops[crop.name] = Item.serialize(crop)
+
+        self.crops[crop.name]["quantity"] += quantity
+
+    def add_animal(self, unique_name, quantity):
+        animal = Item.get_item_from_unique_name(unique_name)
+
+        if animal.name not in self.animals:
+            self.animals[animal.name] = Item.serialize(animal)
+
+        self.animals[animal.name]["quantity"] += quantity
+
+    @staticmethod
+    def serialize(island):
+        data = {
+            "id": str(island.uuid),
+            "name": island.name,
+            "type": island.type,
+            "date_time": island.start_time.strftime("%a %d %b %Y, %I:%M%p"),
+            "crops": island.serialize_crops(),
+            "animals": island.serialize_animals(),
+        }
+        return data
+
+    def serialize_animals(self):
+        serialized = []
+
+        for key, value in self.animals.items():
+            serialized.append(value)
+
+        return serialized
+
+    def serialize_crops(self):
+        serialized = []
+
+        for key, value in self.crops.items():
+            serialized.append(value)
+
+        return serialized
+
+    @staticmethod
+    def get_all_island():
+        query = Island.select().order_by(Island.start_time.desc())
+        a = [Island.serialize(island) for island in query]
+        return a
+
+    @staticmethod
+    def get_total_harvest_by_date(date=datetime.today()):
+
+        date = date
+        tomorrow = date + timedelta(days=1)
+
+        query = Island.select().where(
+            Island.start_time >= date.date(),
+            Island.start_time < tomorrow.date(),
+        )
+
+        total_crops = {}
+        total_animals = {}
+
+        for island in query:
+
+            crops = island.crops
+            for key, value in crops.items():
+                if key not in total_crops:
+                    total_crops[key] = {
+                        "name": key,
+                        "quantity": value["quantity"],
+                        "image": value["image"],
+                    }
+                else:
+                    total_crops[key]["quantity"] += value["quantity"]
+
+            animals = island.animals
+            for key, value in animals.items():
+                if key not in total_animals:
+                    total_animals[key] = {
+                        "name": key,
+                        "quantity": value["quantity"],
+                        "image": value["image"],
+                    }
+                else:
+                    total_animals[key]["quantity"] += value["quantity"]
+
+        crops_result = []
+        for key, value in total_crops.items():
+            crops_result.append(value)
+
+        animals_result = []
+        for key, value in total_animals.items():
+            animals_result.append(value)
+
+        return {
+            "crops": crops_result,
+            "animals": animals_result,
+            "date": str(date.date()),
+        }
+
+    @staticmethod
+    def get_island_from_code(code: str):
+        island = map_data[code]
+
+        obj = Island(id=island["id"], name=island["name"], type=island["type"])
+
+        return obj

albibong/classes/utils.py

@@ -1,5 +1,13 @@
+import os
+import platform
+from importlib.metadata import version
 from uuid import UUID
 
+from scapy.all import conf, get_if_addr
+
+FILENAME = os.path.join(os.path.expanduser("~"), "Albibong/Debug/user_spec.txt")
+os.makedirs(os.path.dirname(FILENAME), exist_ok=True)
+
 
 class Utils:
 
@@ -7,3 +15,15 @@ class Utils:
     def convert_int_arr_to_uuid(arr):
         b = bytes(arr)
         return UUID(bytes=b)
+
+    @staticmethod
+    def get_user_specifications(install_source: str):
+        os_ver = f"{platform.system()} {platform.release()}"
+        python_ver = platform.python_version()
+        albibong_ver = version("albibong")
+        interfaces = f"{conf.iface} ({get_if_addr(conf.iface)})"
+
+        text = f"\n===\n\nAlbibong Ver        : {albibong_ver}\nPython Ver          : {python_ver}\nOS Ver              : {os_ver}\nInstallation Source : {install_source}\nInterfaces          : {interfaces}\n\n===\n"
+        print(text)
+        with open(FILENAME, "w+") as file:
+            file.write(text)

albibong/gui_dist/assets/index-B31tZ4Ku.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}}input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}._passed_ifjrf_1{background-color:green}._failed_ifjrf_4{background-color:red}._healthCheckDiv_ifjrf_7{width:1rem;height:1rem;border-radius:1rem}._toolbar_ifjrf_14{display:flex;justify-content:space-between}._data_ifjrf_19{display:flex;gap:1rem;align-items:center}._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_1kru6_1{border-radius:1rem;width:100%;padding:2rem;display:flex;flex-direction:column;gap:1rem}._tag_1kru6_12{background-color:#64d3ff;padding:0 1rem;border-radius:1rem;color:#0f3c4e;font-weight:700}._stats_1kru6_20{display:flex;flex-direction:row;align-items:start;gap:.5rem}._statRow_1kru6_27{display:flex;flex-direction:row;align-items:start;gap:3rem}._stickToTop_1kru6_34{z-index:10;position:sticky;top:64px;left:0;width:100%;padding:24px 0}@media screen and (max-width: 1000px){._statRow_1kru6_27{width:100%;justify-content:space-between;gap:0}}._container_1ha35_1{display:flex;flex-direction:column;align-items:center;gap:8px;width:100%;gap:1.5rem}._snackbar_1ha35_10{position:fixed;right:64px}._stats_1ha35_15{display:flex;flex-direction:row;align-items:center;gap:.5rem}._options_1ha35_22{display:flex;flex-direction:row;align-items:center;gap:2rem}._row_1ha35_29{display:flex;width:100%;justify-content:space-between;align-items:center}._hidden_1ha35_36{display:none}._column_owxpy_1{width:50%;display:flex;flex-direction:column;gap:16px}._row_owxpy_8{display:flex;gap:40px}._harvest_owxpy_13{display:flex;gap:8px;align-items:center}._statsContainer_owxpy_19{width:100%;display:flex;flex-direction:column;gap:0}