Small fixes

NightmareXIV · Jun 22, 2024 · 5ed804a · 5ed804a
1 parent 47f635f
commit 5ed804a
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/DynamicBridge/DynamicBridge.cs b/DynamicBridge/DynamicBridge.cs
@@ -60,7 +60,7 @@ public DynamicBridge(DalamudPluginInterface pi)
     {
         P = this;
         ECommonsMain.Init(pi, this, Module.DalamudReflector);
-        PatreonBanner.IsOfficialPlugin = Utils.IsDisguise;
+        ECommonsMain.IsOfficialPlugin = Utils.IsDisguise;
         new TickScheduler(() =>
         {
             C = EzConfig.Init<Config>();
@@ -167,7 +167,7 @@ private void OnCommand(string command, string arguments)
                 var profile = Utils.Profile();
                 if (profile != null)
                 {
-                    profile.Presets.Each(x => x.IsStatic = false);
+                    profile.GetPresetsListUnion().Each(x => x.Each(z => z.IsStatic = false));
                     Notify.Success(Lang.UsingDynamicRulesNow);
                     P.ForceUpdate = true;
                 }

diff --git a/DynamicBridge/DynamicBridge.csproj b/DynamicBridge/DynamicBridge.csproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Authors>NightmareXIV</Authors>
-        <Version>1.0.5.9</Version>
+        <Version>1.0.6.0</Version>
     </PropertyGroup>
 
     <PropertyGroup>

diff --git a/DynamicBridge/Gui/GuiRules.cs b/DynamicBridge/Gui/GuiRules.cs
@@ -394,12 +394,15 @@ void FiltersSelection()
                                         ImGui.SameLine();
                                     }
                                     ImGui.PushStyleColor(ImGuiCol.Text, EColor.CyanBright);
-                                    DrawSelector(Lang.CurrentEmote.Params(id, cond.Name.ExtractText())+"##{cond.RowId}", cond.RowId, rule.Emotes, rule.Not.Emotes);
+                                    DrawSelector(
+                                        Lang.CurrentEmote
+                                        .Params(cond.RowId, cond.Name.ExtractText().NullWhenEmpty() ?? $"Unnamed")
+                                        +"##{cond.RowId}", cond.RowId, rule.Emotes, rule.Not.Emotes);
                                     ImGui.PopStyleColor();
                                     ImGui.Separator();
                                 }
 
-                                foreach (var cond in Svc.Data.GetExcelSheet<Emote>().Where(e => e.Name?.ExtractText().IsNullOrEmpty() == false || e.Icon != 0))
+                                foreach (var cond in Svc.Data.GetExcelSheet<Emote>().Where(e => e.Name?.ExtractText().IsNullOrEmpty() == false || e.Icon != 0 || rule.Emotes.Contains(e.RowId)))
                                 {
                                     var name = cond.Name?.ExtractText() ?? "";
                                     if (Filters[filterCnt].Length > 0 && !name.Contains(Filters[filterCnt], StringComparison.OrdinalIgnoreCase)) continue;
@@ -409,7 +412,7 @@ void FiltersSelection()
                                         ImGui.Image(texture.ImGuiHandle, iconSize);
                                         ImGui.SameLine();
                                     }
-                                    DrawSelector($"{name}##{cond.RowId}", cond.RowId, rule.Emotes, rule.Not.Emotes);
+                                    DrawSelector($"{name.NullWhenEmpty() ?? $"Unnamed/{cond.RowId}"}##{cond.RowId}", cond.RowId, rule.Emotes, rule.Not.Emotes);
                                 }
                                 ImGui.EndCombo();
                             }

diff --git a/DynamicBridge/IPC/Glamourer/GlamourerManager.cs b/DynamicBridge/IPC/Glamourer/GlamourerManager.cs
@@ -29,6 +29,7 @@ public void RevertToAutomation()
     }
 
     private ApplyDesign ApplyDesign = new(Svc.PluginInterface);
+
     public void ApplyByGuid(Guid guid)
     {
         try
@@ -88,6 +89,7 @@ public void ApplyToSelf(GlamourerDesignInfo design)
         try
         {
             ApplyByGuid(design.Identifier);
+            //Commands.ApplyByGuid(design.Identifier);
         }
         catch (Exception e)
         {
@@ -101,6 +103,7 @@ public void Revert()
     {
         try
         {
+            //Commands.Revert();
             RevertState.Invoke(0);
         }
         catch (Exception e)

diff --git a/DynamicBridge/Utils.cs b/DynamicBridge/Utils.cs
@@ -1,6 +1,5 @@
 using Dalamud.Memory;
 using DynamicBridge.Configuration;
-using DynamicBridge.IPC.Honorific;
 using ECommons.ExcelServices;
 using ECommons.GameFunctions;
 using ECommons.GameHelpers;