0.1.2

Fixed:

1. Error with None on material cards.
2. Error with icons, paths switched to large case

[PyPi] - https://pypi.org/project/wuwaimagen/

Author: DEViantUA

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wuwaimagen"
-version = "0.1.1" 
+version = "0.1.2" 
 description = "WuWaImaGen - is a Python module that allows you to generate images for projects based on the game Wuthering Waves"
 authors = ["DeviantUa <[email protected]>"]
 license = "MIT"

wuwaimagen/src/components/material.py

@@ -35,7 +35,7 @@ async def get_items(self):
         for key in self.consume:
             item = next(filter(lambda x: x["Id"] == int(key), self.ItemInfo), None)
             if not item  is None:
-                icon = item.get("Icon").split("Image")[1].lower().split(".")[0]
+                icon = item.get("Icon").split("Image")[1].split(".")[0]
                 items[key] = {"id": int(key), "icon": utils.link_icon + icon + ".png", "rarity": item.get("QualityId"), "value": self.consume[key]}
 
         return utils.sort_items(items)
@@ -119,7 +119,10 @@ async def add_skill(
                 if str(key["SkillLevelGroupId"])[-1:] == "7":
                     if forte_circuit.min >= key["SkillId"] or forte_circuit.max < key["SkillId"]:
                         continue
-                    
+                
+                if key["Consume"] is None:
+                    continue
+                
                 for items_id in key["Consume"]:
                     if not items_id in self.consume:
                         self.consume[items_id] = key["Consume"][items_id]
@@ -198,7 +201,7 @@ async def get_weapon(self, config: MaterialWeapon) -> WeaponInfo:
         weapon_info = next(filter(lambda x: x["ItemId"] == int(config.id), self.WeaponConf), None)
         name = weapon_info.get("WeaponName")
 
-        return  WeaponInfo(id = weapon_info.get("ItemId"), name = self.MultiText.get(name), rarity= weapon_info.get("QualityId"), icon=  utils.WUTHERY_CDN +  f"p/GameData/UIResources/common/image/iconweapon/t_iconweapon{weapon_info.get("ItemId")}_ui.png")
+        return  WeaponInfo(id = weapon_info.get("ItemId"), name = self.MultiText.get(name), rarity= weapon_info.get("QualityId"), icon=  utils.WUTHERY_CDN +  f"p/GameData/UIResources/Common/Image/IconWeapon/T_IconWeapon{weapon_info.get("ItemId")}_UI.png")
 
     async def get_material(
         self, 

wuwaimagen/src/generator/convene.py

@@ -86,7 +86,7 @@ async def create_icons(self, data: RecordCalculator) -> Image.Image:
         name = await create_image_with_text(data.name, 40, max_width=388, color=(255, 255, 255, 255))
         background.alpha_composite(name, (int(208-name.size[0]/2), int(520-name.size[1]/2)))
 
-        return background
+        return {"icon": background, "rarity": data.qualityLevel}
 
     async def build(self, color: tuple) -> Image.Image:
         frame = await files.frame
@@ -100,11 +100,11 @@ async def build(self, color: tuple) -> Image.Image:
         position_x = 353
         position_y = 69
 
-        for _, key in enumerate(self.icon):
+        for _, key in enumerate(reversed(self.icon)):
             if _ in [5,10]:
                 position_y += 177
                 position_x = 353
-            background.alpha_composite(key.resize((115,158)),(position_x,position_y))
+            background.alpha_composite(key["icon"].resize((115,158)),(position_x,position_y))
 
             position_x += 146
 
@@ -132,7 +132,7 @@ async def start(self, art: str) -> Image.Image:
 
         self.icon = []
         i = 1
-        for key in self.data.data:
+        for key in reversed(self.data.data):
             if i == 15:
                 break
 

wuwaimagen/src/model/convene.py

@@ -51,7 +51,7 @@ def __init__(self, *args, **kwargs):
 
     async def get_icon(self):
         if len(str(self.resourceId)) > 5:
-            icon = WUTHERY_CDN +  f"p/GameData/UIResources/common/image/iconweapon/t_iconweapon{self.resourceId}_ui.png"
+            icon = WUTHERY_CDN +  f"d/GameData/UIResources/Common/Image/IconWeapon/T_IconWeapon{self.resourceId}_UI.png"
             return RecordIcon(icon = icon, banner = icon)
         else:
             ''' ===== Outdated way =======
@@ -62,7 +62,7 @@ async def get_icon(self):
             banner = data.get("Background", "").split(".")[1]
             '''
 
-            return RecordIcon(icon = WUTHERY_CDN + f"p/GameData/IDFiedResources/Common/Image/IconRoleHead256/{self.resourceId}.png", banner = WUTHERY_CDN + f"p/GameData/IDFiedResources/Common/Image/IconRolePile/{self.resourceId}.png")
+            return RecordIcon(icon = WUTHERY_CDN + f"d/GameData/IDFiedResources/Common/Image/IconRoleHead256/{self.resourceId}.png", banner = WUTHERY_CDN + f"d/GameData/IDFiedResources/Common/Image/IconRolePile/{self.resourceId}.png")
 
 class Calculator(BaseModel):
     info: Info

wuwaimagen/src/tools/utils.py

@@ -91,7 +91,7 @@ async def auto_link(game_path: str) -> str:
     except Exception as e:
         raise Exception("An error occurred: {}".format(e))
 
-link_icon = "https://files.wuthery.com/p/GameData/UIResources/common/image"
+link_icon = "https://files.wuthery.com/p/GameData/UIResources/Common/Image"
 
 conditions = {
     4: [StatBonusForteCircuit, [1,3]],