Skip to content

Commit

Permalink
Merge pull request #250 from gridhead/scwh
Browse files Browse the repository at this point in the history
Add the recently added weapon `Starcaller's Watch` to the GI Loadouts roster
  • Loading branch information
gridhead authored Jan 3, 2025
2 parents 035d8fd + af0b03b commit 0754f87
Show file tree
Hide file tree
Showing 8 changed files with 3,139 additions and 216 deletions.
Binary file added assets/imgs/weap/catalysts/scwh_a.webp
Binary file not shown.
Binary file added assets/imgs/weap/catalysts/scwh_b.webp
Binary file not shown.
2 changes: 2 additions & 0 deletions assets/weap.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@
<file>imgs/weap/catalysts/roye_b.webp</file>
<file>imgs/weap/catalysts/rygm_a.webp</file>
<file>imgs/weap/catalysts/rygm_b.webp</file>
<file>imgs/weap/catalysts/scwh_a.webp</file>
<file>imgs/weap/catalysts/scwh_b.webp</file>
<file>imgs/weap/catalysts/sffm_a.webp</file>
<file>imgs/weap/catalysts/sffm_b.webp</file>
<file>imgs/weap/catalysts/sfje_a.webp</file>
Expand Down
2 changes: 2 additions & 0 deletions gi_loadouts/data/weap/catalysts/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
ptab,
roye,
rygm,
scwh,
sffm,
sfje,
sfup,
Expand Down Expand Up @@ -75,6 +76,7 @@
"Sacrificial Jade": sfje.SacrificialJade,
"Skyward Atlas": swas.SkywardAtlas,
"Solar Pearl": slpl.SolarPearl,
"Starcaller's Watch": scwh.StarcallersWatch,
"Surf's Up": sfup.SurfsUp,
"The Widsith": twsh.TheWidsith,
"Thrilling Tales of Dragon Slayers": ttds.ThrillingTalesofDragonSlayers,
Expand Down
21 changes: 21 additions & 0 deletions gi_loadouts/data/weap/catalysts/scwh.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
from typing import List

from gi_loadouts.type.rare import Rare
from gi_loadouts.type.weap import Catalyst, WeaponStat, WeaponStatType
from gi_loadouts.type.weap.tier import Tier


class StarcallersWatch(Catalyst):
name: str = "Starcaller's Watch"
seco_stat: WeaponStat = WeaponStat(stat_name=WeaponStatType.elemental_mastery, stat_data=58.0)
tier: Tier = Tier.Tier_1
rare: Rare = Rare.Star_5
refi_name: str = "Offering Unto Wind and Sun"
refi_list: List[str] = [
"Increases Elemental Mastery by 100. Gain the \"Mirror of Night\" effect within 15s after the equipping character creates a shield: The current active party member deals 28% increased DMG to nearby opponents. You can gain the \"Mirror of Night\" effect once every 14s.",
"Increases Elemental Mastery by 125. Gain the \"Mirror of Night\" effect within 15s after the equipping character creates a shield: The current active party member deals 35% increased DMG to nearby opponents. You can gain the \"Mirror of Night\" effect once every 14s.",
"Increases Elemental Mastery by 150. Gain the \"Mirror of Night\" effect within 15s after the equipping character creates a shield: The current active party member deals 42% increased DMG to nearby opponents. You can gain the \"Mirror of Night\" effect once every 14s.",
"Increases Elemental Mastery by 175. Gain the \"Mirror of Night\" effect within 15s after the equipping character creates a shield: The current active party member deals 49% increased DMG to nearby opponents. You can gain the \"Mirror of Night\" effect once every 14s.",
"Increases Elemental Mastery by 200. Gain the \"Mirror of Night\" effect within 15s after the equipping character creates a shield: The current active party member deals 56% increased DMG to nearby opponents. You can gain the \"Mirror of Night\" effect once every 14s.",
]
file: str = "scwh"
3,328 changes: 3,112 additions & 216 deletions gi_loadouts/face/rsrc/weap/__init__.py

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions test/data/weap/test_catalyst.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
pytest.param("Skyward Atlas", 5, 3, "Level 80/90 (Rank 6)", 621, WeaponStatType.attack_perc, 30.2, id="data.weap.catalysts: Skyward Atlas"),
pytest.param("Tulaytullah's Remembrance", 5, 3, "Level 80/90 (Rank 6)", 621, WeaponStatType.critical_damage_perc, 40.2, id="data.weap.catalysts: Tulaytullah's Remembrance"),
pytest.param("Crane's Echoing Call", 5, 4, "Level 80/90 (Rank 6)", 679, WeaponStatType.attack_perc, 15.1, id="data.weap.catalysts: Crane's Echoing Call"),
pytest.param("Starcaller's Watch", 5, 1, "Level 80/90 (Rank 6)", 506, WeaponStatType.elemental_mastery, 241, id="data.weap.catalysts: Starcaller's Watch"),
]
)
def test_catalyst(name: str, rare: int, tier: int, levl: str, batk: int, seco: WeaponStatType, valu: float) -> None:
Expand Down
1 change: 1 addition & 0 deletions test/face/wind/weap/kind/test_catalyst.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
pytest.param("Skyward Atlas", 5, "Level 80/90 (Rank 6)", 621, WeaponStatType.attack_perc, 30.2, 5, id="face.wind.rule: Configuring weapon - Catalyst - Skyward Atlas"),
pytest.param("Tulaytullah's Remembrance", 5, "Level 80/90 (Rank 6)", 621, WeaponStatType.critical_damage_perc, 40.2, 5, id="face.wind.rule: Configuring weapon - Catalyst - Tulaytullah's Remembrance"),
pytest.param("Crane's Echoing Call", 5, "Level 80/90 (Rank 6)", 679, WeaponStatType.attack_perc, 15.1, 5, id="face.wind.rule: Configuring weapon - Catalyst - Crane's Echoing Call"),
pytest.param("Starcaller's Watch", 5, "Level 80/90 (Rank 6)", 506, WeaponStatType.elemental_mastery, 241, 5, id="face.wind.rule: Configuring weapon - Catalyst - Starcaller's Watch"),
]
)
def test_catalyst(runner: MainWindow, name: str, rare: int, levl: str, batk: int, seco: WeaponStatType, valu: float, refn: int | None) -> None:
Expand Down

0 comments on commit 0754f87

Please sign in to comment.