lozy360/CustomizeTool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Added profile priority system, fixed a few issues

Browse Source
This commit is contained in:
RisaDev
2024-10-19 04:51:51 +03:00
parent 7085cf616c
commit 93802e6115
11 changed files with 119 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CustomizePlus/UI/Windows/MainWindow/Tabs/Debug/StateMonitoringTab.cs
View File

@@ -63,7 +63,7 @@ public class StateMonitoringTab
private void DrawProfiles()
{
foreach (var profile in _profileManager.Profiles.OrderByDescending(x => x.Enabled))
foreach (var profile in _profileManager.Profiles.OrderByDescending(x => x.Enabled).ThenByDescending(x => x.Priority))
{
DrawSingleProfile("root", profile);
ImGui.Spacing();
@@ -141,7 +141,7 @@ public class StateMonitoringTab
//characterName = characterName.Incognify();
#endif
var show = ImGui.CollapsingHeader($"[{(profile.Enabled ? "E" : "D")}] {name} on {characterName} [{profile.ProfileType}] [{profile.UniqueId}]###{prefix}-profile-{profile.UniqueId}");
var show = ImGui.CollapsingHeader($"[{(profile.Enabled ? "E" : "D")}] [P:{profile.Priority}] {name} on {characterName} [{profile.ProfileType}] [{profile.UniqueId}]###{prefix}-profile-{profile.UniqueId}");
if (!show)
return;

1
CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfileFileSystemSelector.cs
View File

@@ -241,6 +241,7 @@ public class ProfileFileSystemSelector : FileSystemSelector<Profile, ProfileStat
return false;
}
//todo: priority check
var identifier = _gameObjectService.GetCurrentPlayerActorIdentifier();
if (leaf.Value.Enabled)
state.Color = leaf.Value.Characters.Any(x => x.MatchesIgnoringOwnership(identifier)) ? ColorId.LocalCharacterEnabledProfile : ColorId.EnabledProfile;

56
CustomizePlus/UI/Windows/MainWindow/Tabs/Profiles/ProfilePanel.cs
View File

@@ -18,6 +18,7 @@ using Penumbra.String;
using static FFXIVClientStructs.FFXIV.Client.LayoutEngine.ILayoutInstance;
using CustomizePlus.GameData.Extensions;
using CustomizePlus.Core.Extensions;
using Dalamud.Interface.Components;
namespace CustomizePlus.UI.Windows.MainWindow.Tabs.Profiles;
@@ -33,6 +34,7 @@ public class ProfilePanel
private readonly TemplateEditorEvent _templateEditorEvent;
private string? _newName;
private int? _newPriority;
private Profile? _changedProfile;
private Action? _endAction;
@@ -212,6 +214,30 @@ public class ProfilePanel
}
else
ImGui.TextUnformatted(_selector.Selected!.Incognito);
ImGui.TableNextRow();
ImGuiUtil.DrawFrameColumn("Priority");
ImGui.TableNextColumn();
var priority = _newPriority ?? _selector.Selected!.Priority;
ImGui.SetNextItemWidth(50);
if (ImGui.InputInt("##Priority", ref priority, 0, 0))
{
_newPriority = priority;
_changedProfile = _selector.Selected;
}
if (ImGui.IsItemDeactivatedAfterEdit() && _changedProfile != null)
{
_manager.SetPriority(_changedProfile, priority);
_newPriority = null;
_changedProfile = null;
}
ImGuiComponents.HelpMarker("Profiles with a higher number here take precedence before profiles with a lower number.\n" +
"That means if two or more profiles affect same character, profile with higher priority will be applied to that character.");
}
}
}
@@ -345,6 +371,36 @@ public class ProfilePanel
ImGui.TableNextColumn();
ImGui.AlignTextToFramePadding();
ImGui.TextUnformatted(!_selector.IncognitoMode ? $"{character.ToNameWithoutOwnerName()}{character.TypeToString()}" : "Incognito");
var profiles = _manager.GetEnabledProfilesByActor(character).ToList();
if (profiles.Count > 1)
{
//todo: make helper
ImGui.SameLine();
if(profiles.Any(x => x.IsTemporary))
{
ImGui.PushStyleColor(ImGuiCol.Text, Constants.Colors.Error);
ImGuiUtil.PrintIcon(FontAwesomeIcon.Lock);
}
else if (profiles[0] != _selector.Selected!)
{
ImGui.PushStyleColor(ImGuiCol.Text, Constants.Colors.Warning);
ImGuiUtil.PrintIcon(FontAwesomeIcon.ExclamationTriangle);
}
else
{
ImGui.PushStyleColor(ImGuiCol.Text, Constants.Colors.Info);
ImGuiUtil.PrintIcon(FontAwesomeIcon.Star);
}
ImGui.PopStyleColor();
if (profiles.Any(x => x.IsTemporary))
ImGuiUtil.HoverTooltip("This character is being affected by temporary profile set by external plugin. This profile will not be applied!");
else
ImGuiUtil.HoverTooltip(profiles[0] != _selector.Selected! ? "Several profiles are trying to affect this character. This profile will not be applied!" :
"Several profiles are trying to affect this character. This profile is being applied.");
}
}
}