Merge pull request #1097 from erdelf/master

adjusting leveling mode display

Author: erdelf

AutoDuty/AutoDuty.cs

@@ -755,7 +755,7 @@ internal unsafe void LoopTasks(bool queue = true)
             {
                 if (this.LevelingModeEnum == LevelingMode.Support && this.Configuration.PreferTrustOverSupportLeveling && duty.ClassJobLevelRequired > 70)
                 {
-                    levelingModeEnum           = LevelingMode.TrustSolo;
+                    levelingModeEnum           = LevelingMode.Trust_Solo;
                     Configuration.dutyModeEnum = DutyMode.Trust;
 
                     Content? dutyTrust = LevelingHelper.SelectHighestLevelingRelevantDuty(this.LevelingModeEnum);

AutoDuty/Data/Enums.cs

@@ -247,8 +247,8 @@ public enum LevelingMode : int
         {
             None = 0,
             Support = 1,
-            TrustGroup = 2,
-            TrustSolo = 3
+            Trust_Group = 2,
+            Trust_Solo = 3
         }
 
         [Flags]

AutoDuty/Data/Extensions.cs

@@ -140,7 +140,7 @@ public static string ToName(this Sounds value)
         }
 
         public static bool IsTrustLeveling(this LevelingMode mode) =>
-            mode is LevelingMode.TrustGroup or LevelingMode.TrustSolo;
+            mode is LevelingMode.Trust_Group or LevelingMode.Trust_Solo;
 
 
         public static (string url, string name) GetExternalPluginData(this ExternalPlugin plugin) =>

AutoDuty/Helpers/LevelingHelper.cs

@@ -72,7 +72,7 @@ internal static Content[] LevelingDuties
 
                 switch (mode)
                 {
-                    case LevelingMode.TrustGroup:
+                    case LevelingMode.Trust_Group:
                     {
                         foreach ((TrustMemberName _, TrustMember member) in TrustHelper.Members)
                         {
@@ -83,7 +83,7 @@ internal static Content[] LevelingDuties
 
                         break;
                     }
-                    case LevelingMode.TrustSolo:
+                    case LevelingMode.Trust_Solo:
                     {
                         int memberIndex = 0;
                         foreach ((TrustMemberName _, TrustMember member) in TrustHelper.Members.OrderByDescending(tm => tm.Value.Level))

AutoDuty/Windows/MainTab.cs

@@ -285,26 +285,31 @@ static void DrawPathSelection()
                             ImGui.TextColored(Plugin.LevelingModeEnum == LevelingMode.None ? new Vector4(1, 0, 0, 1) : new Vector4(0, 1, 0, 1), "Select Leveling Mode: ");
                             ImGui.SameLine(0);
                             ImGui.PushItemWidth(ImGui.GetContentRegionAvail().X);
-                            if (ImGui.BeginCombo("##LevelingModeEnum", Plugin.LevelingModeEnum == LevelingMode.None ? "None" : 
-                                                                           Plugin.LevelingModeEnum == LevelingMode.TrustSolo ? "Auto Solo" : "Auto"))
+                            if (ImGui.BeginCombo("##LevelingModeEnum", Plugin.LevelingModeEnum switch
+                                {
+                                    LevelingMode.None => "None",
+                                    _ => $"{Plugin.LevelingModeEnum.ToCustomString().Replace(Plugin.Configuration.DutyModeEnum.ToString(), null)} Auto".Trim()
+                                }))
                             {
                                 if (ImGui.Selectable("None", Plugin.LevelingModeEnum == LevelingMode.None))
                                 {
                                     Plugin.LevelingModeEnum = LevelingMode.None;
                                     Plugin.Configuration.Save();
                                 }
-                                if (ImGui.Selectable("Auto", Plugin.LevelingModeEnum == (Plugin.Configuration.DutyModeEnum == DutyMode.Support ? LevelingMode.Support : LevelingMode.TrustGroup)))
+
+                                LevelingMode autoLevelMode = (Plugin.Configuration.DutyModeEnum == DutyMode.Support ? LevelingMode.Support : LevelingMode.Trust_Group);
+                                if (ImGui.Selectable($"{autoLevelMode.ToCustomString().Replace(Plugin.Configuration.DutyModeEnum.ToString(), null)} Auto".Trim(), Plugin.LevelingModeEnum == autoLevelMode))
                                 {
-                                    Plugin.LevelingModeEnum = Plugin.Configuration.DutyModeEnum == DutyMode.Support ? LevelingMode.Support : LevelingMode.TrustGroup;
+                                    Plugin.LevelingModeEnum = autoLevelMode;
                                     Plugin.Configuration.Save();
                                     if (Plugin.Configuration.AutoEquipRecommendedGear)
                                         AutoEquipHelper.Invoke();
                                 }
 
                                 if(Plugin.Configuration.DutyModeEnum == DutyMode.Trust)
-                                    if (ImGui.Selectable("Auto Solo", Plugin.LevelingModeEnum == LevelingMode.TrustSolo))
+                                    if (ImGui.Selectable($"{LevelingMode.Trust_Solo.ToCustomString().Replace(Plugin.Configuration.DutyModeEnum.ToString(), null)} Auto".Trim(), Plugin.LevelingModeEnum == LevelingMode.Trust_Solo))
                                     {
-                                        Plugin.LevelingModeEnum = LevelingMode.TrustSolo;
+                                        Plugin.LevelingModeEnum = LevelingMode.Trust_Solo;
                                         Plugin.Configuration.Save();
                                         if (Plugin.Configuration.AutoEquipRecommendedGear)
                                             AutoEquipHelper.Invoke();