Skip to content

Add 'Phoenix Strike' as enable/disable option in Class-Specific settings for Mosaic Assassin #732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ItsMikesch wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Add 'Phoenix Strike' as enable/disable option in Class-Specific settings for Mosaic Assassin #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
625b9ec
Update mosaic.go
ItsMikesch Mar 12, 2025
822a03b
Update config.go
ItsMikesch Mar 12, 2025
1cf9a96
Update http_server.go
ItsMikesch Mar 12, 2025
a7c7639
Update character_settings.gohtml
ItsMikesch Mar 12, 2025
1641a67
Merge branch 'hectorgimenez:main' into main
ItsMikesch Mar 20, 2025
dc988bf
Merge branch 'hectorgimenez:main' into main
ItsMikesch Apr 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions internal/character/mosaic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,11 @@ func (s MosaicSin) KillMonsterSequence(
}

// Phoenix Strike - 2 charges
if !s.Data.PlayerUnit.States.HasState(state.Phoenixstrike) || (foundPhoenix && phoenixCharges.Value < 2) {
step.SecondaryAttack(skill.PhoenixStrike, id, 1)
continue
if ctx.CharacterCfg.Character.MosaicSin.UsePhoenixStrike {
if !s.Data.PlayerUnit.States.HasState(state.Phoenixstrike) || (foundPhoenix && phoenixCharges.Value < 2) {
step.SecondaryAttack(skill.PhoenixStrike, id, 1)
continue
}
}

if !s.MobAlive(id, *s.Data) {
Expand Down
1 change: 1 addition & 0 deletions internal/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ type CharacterCfg struct {
UseClawsOfThunder bool `yaml:"useClawsOfThunder"`
UseBladesOfIce bool `yaml:"useBladesOfIce"`
UseFistsOfFire bool `yaml:"useFistsOfFire"`
UsePhoenixStrike bool `yaml:"usePhoenixStrike"`
} `yaml:"mosaic_sin"`
} `yaml:"character"`

Expand Down
1 change: 1 addition & 0 deletions internal/server/http_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,7 @@ func (s *HttpServer) characterSettings(w http.ResponseWriter, r *http.Request) {
cfg.Character.MosaicSin.UseClawsOfThunder = r.Form.Has("mosaicUseClawsOfThunder")
cfg.Character.MosaicSin.UseBladesOfIce = r.Form.Has("mosaicUseBladesOfIce")
cfg.Character.MosaicSin.UseFistsOfFire = r.Form.Has("mosaicUseFistsOfFire")
cfg.Character.MosaicSin.UsePhoenixStrike = r.Form.Has("mosaicUsePhoenixStrike")
}

for y, row := range cfg.Inventory.InventoryLock {
Expand Down
14 changes: 9 additions & 5 deletions internal/server/templates/character_settings.gohtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,24 +123,28 @@
<fieldset class="grid">
<label>
<input type="checkbox" name="mosaicUseTigerStrike" {{ if .Config.Character.MosaicSin.UseTigerStrike }}checked{{ end }}/>
Use Tiger Strike
Tiger Strike
</label>
<label>
<input type="checkbox" name="mosaicUseCobraStrike" {{ if .Config.Character.MosaicSin.UseCobraStrike }}checked{{ end }}/>
Use Cobra Strike
Cobra Strike
</label>
<label>
<input type="checkbox" name="mosaicUseClawsOfThunder" {{ if .Config.Character.MosaicSin.UseClawsOfThunder }}checked{{ end }}/>
Use Claws of Thunder
Claws of Thunder
</label>
<label>
<input type="checkbox" name="mosaicUseBladesOfIce" {{ if .Config.Character.MosaicSin.UseBladesOfIce }}checked{{ end }}/>
Use Blades of Ice
Blades of Ice
</label>
<label>
<input type="checkbox" name="mosaicUseFistsOfFire" {{ if .Config.Character.MosaicSin.UseFistsOfFire }}checked{{ end }}/>
Use Fists of Fire
Fists of Fire
</label>
<label>
<input type="checkbox" name="mosaicUsePhoenixStrike" {{ if .Config.Character.MosaicSin.UsePhoenixStrike }}checked{{ end }}/>
Phoenix Strike
</label>
</fieldset>
</div>
</div>
Expand Down