Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add glaive weapon support
Browse files Browse the repository at this point in the history
- Update item_type.py
- Update common.py
- Update gen_data.py
- Update item_types.json
JoShMiQueL committed Oct 10, 2024
1 parent 6c4f88b commit 41f023a
Showing 4 changed files with 5 additions and 0 deletions.
1 change: 1 addition & 0 deletions assets/lang/enUS/item_types.json
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@
"OffHandTotem": "totem",
"Polearm": "polearm",
"Quarterstaff": "quarterstaff",
"Glaive": "glaive",
"Ring": "ring",
"Scythe": "scythe",
"Scythe2H": "two-handed scythe",
2 changes: 2 additions & 0 deletions src/gui/importer/common.py
Original file line number Diff line number Diff line change
@@ -52,6 +52,8 @@ def fix_weapon_type(input_str: str) -> ItemType | None:
return ItemType.Scythe2H
if "quarterstaff" in input_str:
return ItemType.Quarterstaff
if "glaive" in input_str:
return ItemType.Glaive
if "scythe" in input_str:
return ItemType.Scythe
if "crossbow" in input_str:
1 change: 1 addition & 0 deletions src/item/data/item_type.py
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ class ItemType(Enum):
OffHandTotem = "totem"
Polearm = "polearm"
Quarterstaff = "quarterstaff"
Glaive = "glaive"
Ring = "ring"
Scythe = "scythe"
Scythe2H = "two-handed scythe"
1 change: 1 addition & 0 deletions src/tools/gen_data.py
Original file line number Diff line number Diff line change
@@ -174,6 +174,7 @@ def main(d4data_dir: Path, companion_app_dir: Path):
"OffHandTotem",
"Polearm",
"Quarterstaff",
"Glaive",
"Ring",
"Scythe",
"Scythe2H",

0 comments on commit 41f023a

Please sign in to comment.