Merge pull request #435 from FFXIV-CombatReborn/redtext

Submodule update and fix TopPriorityHostile causing redtext
FFXIV-CombatReborn · Oct 19, 2024 · 5d8164a · 5d8164a
2 parents c463fbc + 09a337e
commit 5d8164a
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/ECommons b/ECommons
diff --git a/RotationSolver.Basic/Configuration/Conditions/ActionCondition.cs b/RotationSolver.Basic/Configuration/Conditions/ActionCondition.cs
@@ -67,8 +67,6 @@ protected override bool IsTrueInside(ICustomRotation rotation)
                 break;
             case ActionConditionType.CanUse:
                 return _action.CanUse(out var act);
-                break;
-
         }
         return false;
     }

diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs
@@ -318,7 +318,10 @@ internal static bool IsTopPriorityHostile(this IGameObject obj)
 
         var fateId = DataCenter.FateId;
 
-        if (obj is IBattleChara b && b.StatusList?.Any(StatusHelper.IsPriority) == true) return true;
+        if (obj is IBattleChara b)
+        {
+            if (b.StatusList != null && b.StatusList.Any(StatusHelper.IsPriority)) return true;
+        }
 
         if (Service.Config.ChooseAttackMark && MarkingHelper.AttackSignTargets.FirstOrDefault(id => id != 0) == (long)obj.GameObjectId) return true;
 

diff --git a/RotationSolver.Basic/RotationSolver.Basic.csproj b/RotationSolver.Basic/RotationSolver.Basic.csproj
@@ -68,7 +68,7 @@
 		  <PrivateAssets>all</PrivateAssets>
 	  </ProjectReference>
 
-	  <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+	  <PackageReference Include="System.Drawing.Common" Version="8.0.10" />
 	  <ProjectReference Include="..\RotationSolver.SourceGenerators\RotationSolver.SourceGenerators.csproj" OutputItemType="Analyzer" ExcludeAssets="All" />
 
 	  <None Include="..\COPYING.LESSER">

diff --git a/RotationSolver.SourceGenerators/RotationSolver.SourceGenerators.csproj b/RotationSolver.SourceGenerators/RotationSolver.SourceGenerators.csproj
@@ -7,7 +7,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs
@@ -17,15 +17,16 @@ static ActionUpdater() {
         EzIPC.Init(typeof(ActionUpdater), "RotationSolverReborn.ActionUpdater");
     }
 
-    [EzIPCEvent] public static Action<uint>? NextGCDActionChanged;
-    [EzIPCEvent] public static Action<uint>? NextActionChanged;
+    [EzIPCEvent] public static Action<uint> NextGCDActionChanged = delegate { };
+    [EzIPCEvent] public static Action<uint> NextActionChanged = delegate { };
 
     private static IAction? _nextAction;
-    internal static IAction? NextAction 
+    internal static IAction? NextAction
     {
         get => _nextAction;
-        set {
-            if (_nextAction != value) 
+        set
+        {
+            if (_nextAction != value)
             {
                 _nextAction = value;
                 NextActionChanged?.Invoke(_nextAction?.ID ?? 0);
+11 −0		ECommons/GenericHelpers.cs
+5 −2		ECommons/ImGuiMethods/EzOverlayWindow.cs
+21 −6		ECommons/ImGuiMethods/ImGuiEx/ImGuiEx.cs
+21 −0		ECommons/MathHelpers/Number.cs
+31 −5		ECommons/UIHelpers/AddonMasterImplementations/!AddonMasterBase.cs
+21 −0		ECommons/UIHelpers/AddonMasterImplementations/Bank.cs
+52 −0		ECommons/UIHelpers/AddonMasterImplementations/BankaCraftworksSupply.cs
+3 −0		ECommons/UIHelpers/AddonMasterImplementations/BannerEditor.cs
+3 −0		ECommons/UIHelpers/AddonMasterImplementations/BannerList.cs
+3 −0		ECommons/UIHelpers/AddonMasterImplementations/ColorantColoring.cs
+17 −0		ECommons/UIHelpers/AddonMasterImplementations/ContentsFinderSetting.cs
+28 −13		ECommons/UIHelpers/AddonMasterImplementations/ContextMenu.cs
+18 −0		ECommons/UIHelpers/AddonMasterImplementations/Dialogue.cs
+3 −0		ECommons/UIHelpers/AddonMasterImplementations/DifficultySelectYesNo.cs
+9 −0		ECommons/UIHelpers/AddonMasterImplementations/GatheringMasterpiece.cs
+31 −0		ECommons/UIHelpers/AddonMasterImplementations/GcArmyChangeClass.cs
+13 −0		ECommons/UIHelpers/AddonMasterImplementations/GcArmyExpeditionResult.cs
+35 −0		ECommons/UIHelpers/AddonMasterImplementations/GcArmyMenberProfile.cs
+15 −0		ECommons/UIHelpers/AddonMasterImplementations/GcArmyTraining.cs
+22 −0		ECommons/UIHelpers/AddonMasterImplementations/InputNumeric.cs
+15 −0		ECommons/UIHelpers/AddonMasterImplementations/ItemFinder.cs
+59 −0		ECommons/UIHelpers/AddonMasterImplementations/ItemSearchResult.cs
+0 −1		ECommons/UIHelpers/AddonMasterImplementations/JournalResult.cs
+15 −0		ECommons/UIHelpers/AddonMasterImplementations/LetterHistory.cs
+19 −0		ECommons/UIHelpers/AddonMasterImplementations/LetterList.cs
+34 −0		ECommons/UIHelpers/AddonMasterImplementations/LetterViewer.cs
+5 −5		ECommons/UIHelpers/AddonMasterImplementations/LookingForGroupDetail.cs
+24 −0		ECommons/UIHelpers/AddonMasterImplementations/ManeuversArmorBoarding.cs
+18 −0		ECommons/UIHelpers/AddonMasterImplementations/ManeuversRecord.cs
+1 −2		ECommons/UIHelpers/AddonMasterImplementations/MaterializeDialog.cs
+15 −0		ECommons/UIHelpers/AddonMasterImplementations/PvpProfile.cs
+20 −0		ECommons/UIHelpers/AddonMasterImplementations/PvpReward.cs
+2 −2		ECommons/UIHelpers/AddonMasterImplementations/RetainerSell.cs
+3 −4		ECommons/UIHelpers/AddonMasterImplementations/SalvageDialog.cs
+1 −2		ECommons/UIHelpers/AddonMasterImplementations/SalvageResult.cs
+29 −10		ECommons/UIHelpers/AddonMasterImplementations/SelectIconString.cs
+29 −20		ECommons/UIHelpers/AddonMasterImplementations/SelectString.cs
+9 −4		ECommons/UIHelpers/AddonMasterImplementations/SelectYesno.cs
+20 −0		ECommons/UIHelpers/AddonMasterImplementations/ShopExchangeCurrencyDialog.cs
+17 −0		ECommons/UIHelpers/AddonMasterImplementations/ShopExchangeItemDialog.cs
+19 −0		ECommons/UIHelpers/AddonMasterImplementations/VoteMvp.cs
+17 −0		ECommons/UIHelpers/AddonMasterImplementations/WeeklyBingoResult.cs
+12 −14		ECommons/UIHelpers/AddonMasterImplementations/_CharaSelectListMenu.cs
+13 −8		ECommons/UIHelpers/AddonMasterImplementations/_TitleMenu.cs
+54 −0		ECommons/UIHelpers/AtkReaderImplementations/ReaderBannerList.cs
+27 −0		ECommons/UIHelpers/AtkReaderImplementations/ReaderLetterHistory.cs
+17 −0		ECommons/UIHelpers/AtkReaderImplementations/ReaderLetterViewer.cs
-Original file line number
+Diff line change
@@ Expand Up @@
                     break;
                 case ActionConditionType.CanUse:
                     return _action.CanUse(out var act);
-                    break;
             }
             return false;
         }
@@ Expand Down @@