Skip to content
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

Submodule update and fix TopPriorityHostile causing redtext #435

Merged
merged 2 commits into from
Oct 19, 2024
Merged

Submodule update and fix TopPriorityHostile causing redtext #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a228b3
Update subproject, fix ObjectHelper, update packages
LTS-FFXIV Oct 19, 2024
09a337e
Refactor ActionUpdater
LTS-FFXIV Oct 19, 2024
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
2 changes: 1 addition & 1 deletion ECommons
Open in desktop
Submodule ECommons updated 47 files
+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
2 changes: 0 additions & 2 deletions RotationSolver.Basic/Configuration/Conditions/ActionCondition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@ protected override bool IsTrueInside(ICustomRotation rotation)
break;
case ActionConditionType.CanUse:
return _action.CanUse(out var act);
break;

}
return false;
}
Expand Down
5 changes: 4 additions & 1 deletion RotationSolver.Basic/Helpers/ObjectHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/RotationSolver.Basic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.SourceGenerators/RotationSolver.SourceGenerators.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 6 additions & 5 deletions RotationSolver/Updaters/ActionUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down