Skip to content

Commit 67cd10a

Browse files
LTS-FFXIVLTS-FFXIV
authored
Merge pull request #955 from FFXIV-CombatReborn/SMNhotfix
Hotfix for SMN actions
2 parents 744e3e8 + 9eb0d11 commit 67cd10a

File tree

6 files changed

+67
-31
lines changed

6 files changed

+67
-31
lines changed

‎RotationSolver.Basic/RotationSolver.Basic.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
<Using Include="Dalamud.Bindings.ImGui" />
7676
<Using Include="Newtonsoft.Json" />
7777

78-
<PackageReference Include="ECommons" Version="3.0.1.5" />
78+
<PackageReference Include="ECommons" Version="3.0.1.9" />
7979

8080
<PackageReference Include="System.Drawing.Common" Version="9.0.8" />
8181
<ProjectReference Include="..\RotationSolver.SourceGenerators\RotationSolver.SourceGenerators.csproj" OutputItemType="Analyzer" ExcludeAssets="All" />

‎RotationSolver.Basic/Rotations/Basic/SummonerRotation.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -591,17 +591,17 @@ static partial void ModifyAkhMornPvE(ref ActionSetting setting)
591591

592592
static partial void ModifyRubyRitePvE(ref ActionSetting setting)
593593
{
594-
setting.ActionCheck = () => RubyRitePvEReady;
594+
setting.ActionCheck = () => RubyRitePvEReady && RuinMasteryIiiTrait.EnoughLevel;
595595
}
596596

597597
static partial void ModifyTopazRitePvE(ref ActionSetting setting)
598598
{
599-
setting.ActionCheck = () => TopazRitePvEReady;
599+
setting.ActionCheck = () => TopazRitePvEReady && RuinMasteryIiiTrait.EnoughLevel;
600600
}
601601

602602
static partial void ModifyEmeraldRitePvE(ref ActionSetting setting)
603603
{
604-
setting.ActionCheck = () => EmeraldRitePvEReady;
604+
setting.ActionCheck = () => EmeraldRitePvEReady && RuinMasteryIiiTrait.EnoughLevel;
605605
}
606606

607607
static partial void ModifySummonPhoenixPvE(ref ActionSetting setting)
@@ -652,17 +652,17 @@ static partial void ModifyRevelationPvE(ref ActionSetting setting)
652652

653653
static partial void ModifyRubyCatastrophePvE(ref ActionSetting setting)
654654
{
655-
setting.ActionCheck = () => RubyCatastrophePvEReady;
655+
setting.ActionCheck = () => RubyCatastrophePvEReady && OutburstMasteryIiTrait.EnoughLevel;
656656
}
657657

658658
static partial void ModifyTopazCatastrophePvE(ref ActionSetting setting)
659659
{
660-
setting.ActionCheck = () => TopazCatastrophePvEReady;
660+
setting.ActionCheck = () => TopazCatastrophePvEReady && OutburstMasteryIiTrait.EnoughLevel;
661661
}
662662

663663
static partial void ModifyEmeraldCatastrophePvE(ref ActionSetting setting)
664664
{
665-
setting.ActionCheck = () => EmeraldCatastrophePvEReady;
665+
setting.ActionCheck = () => EmeraldCatastrophePvEReady && OutburstMasteryIiTrait.EnoughLevel;
666666
}
667667

668668
static partial void ModifyCrimsonCyclonePvE(ref ActionSetting setting)

‎RotationSolver.Basic/packages.lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
"net9.0-windows7.0": {
55
"ECommons": {
66
"type": "Direct",
7-
"requested": "[3.0.1.5, )",
8-
"resolved": "3.0.1.5",
9-
"contentHash": "dUbgHV16y3nq/PgEg244IpBAuP0FQfrBFyrlNDfSkeNrB7Ze7WqOneGP+Nuorr1hLv0p2E2nyrNvFp8mJuKDWQ=="
7+
"requested": "[3.0.1.9, )",
8+
"resolved": "3.0.1.9",
9+
"contentHash": "Bv7Uv9VZwPpS/AA4TnzeCCPw2uanp1Pg9RGpM5lcDWC8ENBNkyp/fAe9JdHwI3WByOZSZVkMvW8jRycBhzehlA=="
1010
},
1111
"Svg": {
1212
"type": "Direct",

‎RotationSolver/RebornRotations/Magical/SMN_Reborn.cs

Lines changed: 52 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -388,30 +388,66 @@ protected override bool GeneralGCD(out IAction? act)
388388
return true;
389389
}
390390

391-
if (RubyOutburstPvE.CanUse(out act))
391+
if (OutburstMasteryIiTrait.EnoughLevel)
392392
{
393-
return true;
394-
}
395-
if (EmeraldOutburstPvE.CanUse(out act))
396-
{
397-
return true;
393+
if (RubyDisasterPvE.CanUse(out act))
394+
{
395+
return true;
396+
}
397+
if (EmeraldDisasterPvE.CanUse(out act))
398+
{
399+
return true;
400+
}
401+
if (TopazDisasterPvE.CanUse(out act))
402+
{
403+
return true;
404+
}
398405
}
399-
if (TopazOutburstPvE.CanUse(out act))
406+
if (!OutburstMasteryIiTrait.EnoughLevel)
400407
{
401-
return true;
408+
if (RubyOutburstPvE.CanUse(out act))
409+
{
410+
return true;
411+
}
412+
if (EmeraldOutburstPvE.CanUse(out act))
413+
{
414+
return true;
415+
}
416+
if (TopazOutburstPvE.CanUse(out act))
417+
{
418+
return true;
419+
}
402420
}
403421

404-
if (RubyRuinPvE.CanUse(out act))
422+
if (RuinMasteryIiiTrait.EnoughLevel)
405423
{
406-
return true;
407-
}
408-
if (EmeraldRuinPvE.CanUse(out act))
409-
{
410-
return true;
424+
if (RubyRitePvE.CanUse(out act))
425+
{
426+
return true;
427+
}
428+
if (EmeraldRitePvE.CanUse(out act))
429+
{
430+
return true;
431+
}
432+
if (TopazRitePvE.CanUse(out act))
433+
{
434+
return true;
435+
}
411436
}
412-
if (TopazRuinPvE.CanUse(out act))
437+
if (!RuinMasteryIiiTrait.EnoughLevel)
413438
{
414-
return true;
439+
if (RubyRuinPvE.CanUse(out act))
440+
{
441+
return true;
442+
}
443+
if (EmeraldRuinPvE.CanUse(out act))
444+
{
445+
return true;
446+
}
447+
if (TopazRuinPvE.CanUse(out act))
448+
{
449+
return true;
450+
}
415451
}
416452

417453
if ((!IsMoving || AddCrimsonCycloneMoving) && CrimsonCyclonePvE.CanUse(out act) && (AddCrimsonCyclone || CrimsonCyclonePvE.Target.Target.DistanceToPlayer() <= CrimsonCycloneDistance))

‎RotationSolver/RotationSolver.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<NoWarn>1591</NoWarn>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="ECommons" Version="3.0.1.5" />
18+
<PackageReference Include="ECommons" Version="3.0.1.9" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<Reference Include="Dalamud.Common">

‎RotationSolver/packages.lock.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
},
1717
"ECommons": {
1818
"type": "Direct",
19-
"requested": "[3.0.1.5, )",
20-
"resolved": "3.0.1.5",
21-
"contentHash": "dUbgHV16y3nq/PgEg244IpBAuP0FQfrBFyrlNDfSkeNrB7Ze7WqOneGP+Nuorr1hLv0p2E2nyrNvFp8mJuKDWQ=="
19+
"requested": "[3.0.1.9, )",
20+
"resolved": "3.0.1.9",
21+
"contentHash": "Bv7Uv9VZwPpS/AA4TnzeCCPw2uanp1Pg9RGpM5lcDWC8ENBNkyp/fAe9JdHwI3WByOZSZVkMvW8jRycBhzehlA=="
2222
},
2323
"ExCSS": {
2424
"type": "Transitive",
@@ -92,7 +92,7 @@
9292
"RotationSolverReborn.Basic": {
9393
"type": "Project",
9494
"dependencies": {
95-
"ECommons": "[3.0.1.5, )",
95+
"ECommons": "[3.0.1.9, )",
9696
"RotationSolver.SourceGenerators": "[1.0.0, )",
9797
"Svg": "[3.4.7, )",
9898
"System.Drawing.Common": "[9.0.8, )"

0 commit comments

Comments
 (0)