Skip to content

Special Attacks adjustments #693

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

Merged
myangelkamikaze merged 6 commits into from
Aug 15, 2026
Merged

Special Attacks adjustments #693

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
5ac868e
Special Attacks adjustments
Jebzou Aug 14, 2026
b4c1396
tests
Jebzou Aug 14, 2026
e6d6b74
test for real
Jebzou Aug 14, 2026
7d0bae5
Escort check
Jebzou Aug 14, 2026
79cf6cf
Escort
Jebzou Aug 14, 2026
56e192e
sonar
Jebzou Aug 14, 2026
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
4 changes: 2 additions & 2 deletions ElectronicObserver.Core/Types/Attacks/Specials/KongouSpecialAttack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ public override bool CanTrigger()
if (flagship is null) return false;

if (!IsKongouClassThirdRemodel(flagship.MasterShip.ShipId)) return false;
if (flagship.HPRate <= 0.5) return false;
if (flagship.HPRate <= 0.25) return false;

IShipData? helper = ships[1];
if (helper is null) return false;
if (helper.HPRate <= 0.5) return false;
if (helper.HPRate <= 0.25) return false;

return IsValidPair(flagship.MasterShip.ShipId, helper.MasterShip.ShipId);
}
Expand Down
2 changes: 1 addition & 1 deletion ElectronicObserver.Core/Types/Attacks/Specials/QueenElizabethSpecialAttack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public override double GetTriggerRate()
IShipData? helper = ships[1];
if (helper is null) return 0;

double rate = Math.Sqrt(flagship.Level) + Math.Sqrt(helper.Level) + 1.2 * (Math.Sqrt(flagship.LuckTotal) + Math.Sqrt(helper.Level));
double rate = Math.Sqrt(flagship.Level) + Math.Sqrt(helper.Level) + 1.2 * (Math.Sqrt(flagship.LuckTotal) + Math.Sqrt(helper.LuckTotal));

return (rate + 30) / 100;
}
Expand Down
16 changes: 2 additions & 14 deletions ElectronicObserver.Core/Types/Attacks/Specials/RichelieuSpecialAttack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,21 +49,9 @@ public override double GetTriggerRate()
IShipData? helper = ships[1];
if (helper is null) return 0;

double rate = Math.Sqrt(flagship.Level) + Math.Sqrt(helper.Level) + 1.2 * (Math.Sqrt(flagship.LuckTotal) + Math.Sqrt(helper.Level));
double rate = Math.Sqrt(flagship.Level) + Math.Sqrt(helper.Level) + 1.2 * (Math.Sqrt(flagship.LuckTotal) + Math.Sqrt(helper.LuckTotal));

int deuxGunBonus = 0;

if (flagship.HasDeuxGun())
{
deuxGunBonus += 5;
}

if (helper.HasDeuxGun())
{
deuxGunBonus += 5;
}

return (rate + 30 + deuxGunBonus) / 100;
return (rate + 30) / 100;
}

public override List<SpecialAttackHit> GetAttacks()
Expand Down
42 changes: 30 additions & 12 deletions ElectronicObserver/Utility/Data/FleetSpecialAttacks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,36 @@ public static class FleetSpecialAttacks
{
public static List<SpecialAttack> GetSpecialAttacks(this IFleetData fleet)
{
List<SpecialAttack> attacks =
[
new NelsonSpecialAttack(fleet),
new NagatoSpecialAttack(fleet),
new ColoradoSpecialAttack(fleet),
new Yamato123SpecialAttack(fleet),
new Yamato12SpecialAttack(fleet),
new KongouSpecialAttack(fleet),
new SubmarineSpecialAttack(fleet),
new RichelieuSpecialAttack(fleet),
new QueenElizabethSpecialAttack(fleet),
];
List<SpecialAttack> attacks;

if (fleet.FleetType is FleetType.Single || fleet.FleetID == 1)
{
attacks = [
new NelsonSpecialAttack(fleet),
new NagatoSpecialAttack(fleet),
new ColoradoSpecialAttack(fleet),
new Yamato123SpecialAttack(fleet),
new Yamato12SpecialAttack(fleet),
new RichelieuSpecialAttack(fleet),
new QueenElizabethSpecialAttack(fleet),
];

if (fleet.FleetType is FleetType.Single)
{
attacks.Add(new KongouSpecialAttack(fleet));
}
}
else
{
attacks = [
new KongouSpecialAttack(fleet),
];
}

if (fleet.FleetType is FleetType.Single)
{
attacks.Add(new SubmarineSpecialAttack(fleet));
}

return attacks
.Where(attack => attack.CanTrigger())
Expand Down
6 changes: 2 additions & 4 deletions ElectronicObserverCoreTests/SpecialAttacks/KongouSpecialAttackTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ public void KongouSpecialAttackTest1()
new ShipDataMock(Db.MasterShips[ShipId.HieiKaiNiC]),
});

Assert.Empty(fleet.GetSpecialAttacks());
Assert.False(specialAttack.CanTrigger());
Assert.True(specialAttack.CanTrigger());
}

[Fact(DisplayName = "Can trigger - Flagship shouha")]
Expand Down Expand Up @@ -77,8 +76,7 @@ public void KongouSpecialAttackTest6()
},
});

Assert.Empty(fleet.GetSpecialAttacks());
Assert.False(specialAttack.CanTrigger());
Assert.True(specialAttack.CanTrigger());
}

[Fact(DisplayName = "Can trigger - Helper shouha")]
Expand Down
Loading