diff --git a/.data/custom/WebsiteText@cht.json b/.data/custom/WebsiteText@cht.json index 6a40e65a..cc1249d2 100644 --- a/.data/custom/WebsiteText@cht.json +++ b/.data/custom/WebsiteText@cht.json @@ -760,7 +760,7 @@ "text": "武器: 劍" }, { - "id": "ENUM_COND_WEAPON_KATANA", + "id": "ENUM_COND_WEAPON_BLADE", "text": "武器: 刀" }, { @@ -784,11 +784,11 @@ "text": "武器: 法" }, { - "id": "ENUM_COND_WEAPON_CANE", + "id": "ENUM_COND_WEAPON_STAFF", "text": "武器: 補" }, { - "id": "ENUM_COND_WEAPON_GUN", + "id": "ENUM_COND_WEAPON_MANACASTER", "text": "武器: 銃" }, { diff --git a/.data/custom/WebsiteText@en.json b/.data/custom/WebsiteText@en.json index c20a7779..bc22fb7c 100644 --- a/.data/custom/WebsiteText@en.json +++ b/.data/custom/WebsiteText@en.json @@ -760,7 +760,7 @@ "text": "Weapon: Sword" }, { - "id": "ENUM_COND_WEAPON_KATANA", + "id": "ENUM_COND_WEAPON_BLADE", "text": "Weapon: Blade" }, { @@ -784,11 +784,11 @@ "text": "Weapon: Wand" }, { - "id": "ENUM_COND_WEAPON_CANE", + "id": "ENUM_COND_WEAPON_STAFF", "text": "Weapon: Staff" }, { - "id": "ENUM_COND_WEAPON_GUN", + "id": "ENUM_COND_WEAPON_MANACASTER", "text": "Weapon: Manacaster" }, { diff --git a/.data/custom/WebsiteText@jp.json b/.data/custom/WebsiteText@jp.json index fd405b2f..aa890985 100644 --- a/.data/custom/WebsiteText@jp.json +++ b/.data/custom/WebsiteText@jp.json @@ -760,7 +760,7 @@ "text": "武器: 劍" }, { - "id": "ENUM_COND_WEAPON_KATANA", + "id": "ENUM_COND_WEAPON_BLADE", "text": "武器: 刀" }, { @@ -784,11 +784,11 @@ "text": "武器: 法" }, { - "id": "ENUM_COND_WEAPON_CANE", + "id": "ENUM_COND_WEAPON_STAFF", "text": "武器: 補" }, { - "id": "ENUM_COND_WEAPON_GUN", + "id": "ENUM_COND_WEAPON_MANACASTER", "text": "武器: 銃" }, { diff --git a/dlparse/enums/condition/category.py b/dlparse/enums/condition/category.py index 76c1717e..273adc2f 100644 --- a/dlparse/enums/condition/category.py +++ b/dlparse/enums/condition/category.py @@ -401,14 +401,14 @@ class ConditionCategories: self_weapon_type = ConditionCategory[Weapon]( { Condition.WEAPON_SWORD: Weapon.SWD, - Condition.WEAPON_KATANA: Weapon.KAT, + Condition.WEAPON_BLADE: Weapon.KAT, Condition.WEAPON_DAGGER: Weapon.DAG, Condition.WEAPON_AXE: Weapon.AXE, Condition.WEAPON_LANCE: Weapon.LAN, Condition.WEAPON_BOW: Weapon.BOW, Condition.WEAPON_ROD: Weapon.ROD, - Condition.WEAPON_CANE: Weapon.CAN, - Condition.WEAPON_GUN: Weapon.GUN, + Condition.WEAPON_STAFF: Weapon.CAN, + Condition.WEAPON_MANACASTER: Weapon.GUN, }, ConditionMaxCount.SINGLE, "Self - weapon type", diff --git a/dlparse/enums/condition/items.py b/dlparse/enums/condition/items.py index 1d32bee7..cda0e5c9 100644 --- a/dlparse/enums/condition/items.py +++ b/dlparse/enums/condition/items.py @@ -155,14 +155,14 @@ class Condition(TranslatableEnumMixin, Enum): # region Weapon type WEAPON_SWORD = 291 - WEAPON_KATANA = 292 + WEAPON_BLADE = 292 WEAPON_DAGGER = 293 WEAPON_AXE = 294 WEAPON_LANCE = 295 WEAPON_BOW = 296 WEAPON_ROD = 297 - WEAPON_CANE = 298 - WEAPON_GUN = 299 + WEAPON_STAFF = 298 + WEAPON_MANACASTER = 299 # endregion # endregion diff --git a/dlparse/enums/weapon.py b/dlparse/enums/weapon.py index 3c9af816..60f30ff2 100644 --- a/dlparse/enums/weapon.py +++ b/dlparse/enums/weapon.py @@ -12,21 +12,21 @@ class Weapon(Enum): NONE = 0 SWD = 1 # Sword - KAT = 2 # Katana + KAT = 2 # Blade (Katana) DAG = 3 # Dagger AXE = 4 # Axe LAN = 5 # Lance BOW = 6 # Bow ROD = 7 # Rod (Damaging Mage) - CAN = 8 # Cane (Healing Mage) - GUN = 9 # Gun + CAN = 8 # Staff (Cane - Healing Mage) + GUN = 9 # Manacaster (Gun) @property def is_valid(self) -> bool: """ Check if the current weapon is valid. - "Valid" means that this needs to be one of Sword, Karana, Dagger, Axe, Lance, Bow, Row or Gun. + "Valid" means that this needs to be one of Sword, Blade, Dagger, Axe, Lance, Bow, Rod, Staff or Manacaster. """ return self in self.get_all_valid_weapons() diff --git a/notes/others/CharaSkillCameraDuration.md b/notes/others/CharaSkillCameraDuration.md index 87e8fc49..907934be 100644 --- a/notes/others/CharaSkillCameraDuration.md +++ b/notes/others/CharaSkillCameraDuration.md @@ -89,14 +89,14 @@ The implementations of these steps can be found [here](/dlparse/mono/asset/motio ### Weapon code - `SWD`: Sword -- `KAT`: Katana +- `KAT`: Blade (Katana) - `DAG`: Dagger - `AXE`: Axe - `LAN`: Lance - `BOW`: Bow - `ROD`: Rod (Damaging Mage) -- `CAN`: Cane (Healing Mage) -- `GUN`: Gun +- `CAN`: Staff (Cane - Healing Mage) +- `GUN`: Manacaster (Gun) ### Credits diff --git a/tests/test_transformer/test_ex/test_by_weapon.py b/tests/test_transformer/test_ex/test_by_weapon.py index 45630819..bf707eda 100644 --- a/tests/test_transformer/test_ex/test_by_weapon.py +++ b/tests/test_transformer/test_ex/test_by_weapon.py @@ -18,7 +18,7 @@ def test_sword(transformer_ability: AbilityTransformer): check_ability_effect_unit_match(ex_ability_data.effect_units, expected_info) -def test_katana(transformer_ability: AbilityTransformer): +def test_blade(transformer_ability: AbilityTransformer): # Nobunaga - 10250103 # https://dragalialost.gamepedia.com/Nobunaga ex_ability_data = transformer_ability.transform_ex_ability(101020010) @@ -123,7 +123,7 @@ def test_staff(transformer_ability: AbilityTransformer): check_ability_effect_unit_match(ex_ability_data.effect_units, expected_info) -def test_gun(transformer_ability: AbilityTransformer): +def test_manacaster(transformer_ability: AbilityTransformer): # Ilia - 10950401 # https://dragalialost.gamepedia.com/Ilia ex_ability_data = transformer_ability.transform_ex_ability(109000009)