Skip to content

Commit 6f08d9f

Browse files
authored
Merge pull request #631 from FFXIV-CombatReborn/CODfix
Fix mixed up statuses for COD immunity
2 parents cbc8a92 + 6020cb5 commit 6f08d9f

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

ECommons

RotationSolver.Basic/Actions/ActionBasicInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ public ActionBasicInfo(IBaseAction action, bool isDutyAction)
158158
IsLimitBreak = (ActionCate?)_action.Action.ActionCategory.Value.RowId
159159
is ActionCate.LimitBreak or ActionCate.LimitBreak_15;
160160
IsDutyAction = isDutyAction;
161-
//Aspect = (Aspect)_action.Action.Aspect; temporarily removing this line. Aspect was removed from lumina for some reason
161+
//Aspect = (Aspect)_action.Action.Aspect; Resolved on next lumina update
162162
}
163163

164164
internal readonly bool BasicCheck(bool skipStatusProvideCheck, bool skipComboCheck, bool skipCastingCheck)

RotationSolver.Basic/Helpers/ObjectHelper.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -523,8 +523,8 @@ public static bool IsCODBossImmune(this IBattleChara obj)
523523

524524
var StygianStatus = StatusID.UnnamedStatus_4388;
525525
var CloudOfDarknessStatus = StatusID.VeilOfDarkness;
526-
var AntiCloudOfDarknessStatus = StatusID.InnerDarkness;
527-
var AntiStygianStatus = StatusID.OuterDarkness;
526+
var AntiCloudOfDarknessStatus = StatusID.OuterDarkness;
527+
var AntiStygianStatus = StatusID.InnerDarkness;
528528

529529
if (obj.IsEnemy())
530530
{
@@ -533,7 +533,7 @@ public static bool IsCODBossImmune(this IBattleChara obj)
533533
{
534534
if (Service.Config.InDebug)
535535
{
536-
Svc.Log.Information("IsCODBossImmune: VeilOfDarkness status found, CloudOfDarkness immune");
536+
Svc.Log.Information("IsCODBossImmune: OuterDarkness status found, CloudOfDarkness immune");
537537
}
538538
return true;
539539
}
@@ -543,7 +543,7 @@ public static bool IsCODBossImmune(this IBattleChara obj)
543543
{
544544
if (Service.Config.InDebug)
545545
{
546-
Svc.Log.Information("IsCODBossImmune: UnnamedStatus4388 status found, Stygian immune");
546+
Svc.Log.Information("IsCODBossImmune: InnerDarkness status found, Stygian immune");
547547
}
548548
return true;
549549
}

RotationSolver.SourceGenerators/RotationSolver.SourceGenerators.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0" />
10+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.13.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

RotationSolver/Commands/RSCommands_Actions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ internal static void UpdateRotationState()
179179
if (playerObject == null)
180180
{
181181
if (Service.Config.InDebug)
182-
Svc.Log.Error("Player object is null.");
182+
Svc.Log.Information("Player object is null.");
183183
return;
184184
}
185185

0 commit comments

Comments
 (0)