feat: remove the CommandType feature.

ArchiDog1998 · Jan 14, 2023 · 30da408 · 30da408
1 parent 25d8262
commit 30da408
Show file tree

Hide file tree

Showing 82 changed files with 136 additions and 391 deletions.
diff --git a/XIVAutoAction/Actions/BaseAction/BaseAction_ActionInfo.cs b/XIVAutoAction/Actions/BaseAction/BaseAction_ActionInfo.cs
@@ -190,7 +190,7 @@ public unsafe virtual bool ShouldUse(out IAction act, bool mustUse = false, bool
                 //如果是个法术需要咏唱，并且还在移动，也没有即刻相关的技能。
                 if (CastTime > 0 && MovingUpdater.IsMoving)
                 {
-                    if (!player.HasStatus(true, CustomCombo<Enum>.Swiftcast.BuffsProvide))
+                    if (!player.HasStatus(true, CustomCombo.Swiftcast.BuffsProvide))
                     {
                         return false;
                     }

diff --git a/XIVAutoAction/Combos/Basic/ASTCombo_Base.cs b/XIVAutoAction/Combos/Basic/ASTCombo_Base.cs
@@ -10,7 +10,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class ASTCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class ASTCombo_Base: CustomCombo.CustomCombo
 {
     private static ASTGauge JobGauge => Service.JobGauges.Get<ASTGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/BLMCombo_Base.cs b/XIVAutoAction/Combos/Basic/BLMCombo_Base.cs
@@ -9,7 +9,7 @@
 
 namespace XIVAutoAttack.Combos.Basic
 {
-    internal abstract partial class BLMCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+    internal abstract partial class BLMCombo_Base : CustomCombo.CustomCombo
     {
         private static BLMGauge JobGauge => Service.JobGauges.Get<BLMGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/BLUCombo_Base.cs b/XIVAutoAction/Combos/Basic/BLUCombo_Base.cs
@@ -16,7 +16,7 @@ internal enum BLUID : byte
         DPS,
     }
 
-    internal abstract class BLUCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+    internal abstract class BLUCombo_Base : CustomCombo.CustomCombo
     {
         internal enum BLUAttackType : byte
         {

diff --git a/XIVAutoAction/Combos/Basic/BRDCombo_Base.cs b/XIVAutoAction/Combos/Basic/BRDCombo_Base.cs
@@ -11,7 +11,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class BRDCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class BRDCombo_Base : CustomCombo.CustomCombo
 {
     private static BRDGauge JobGauge => Service.JobGauges.Get<BRDGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/DNCCombo_Base.cs b/XIVAutoAction/Combos/Basic/DNCCombo_Base.cs
@@ -8,7 +8,7 @@
 using XIVAutoAttack.Helpers;
 
 namespace XIVAutoAttack.Combos.Basic;
-internal abstract class DNCCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class DNCCombo_Base : CustomCombo.CustomCombo
 {
     private static DNCGauge JobGauge => Service.JobGauges.Get<DNCGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/DRGCombo_Base.cs b/XIVAutoAction/Combos/Basic/DRGCombo_Base.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class DRGCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class DRGCombo_Base : CustomCombo.CustomCombo
 {
     private static DRGGauge JobGauge => Service.JobGauges.Get<DRGGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/DRKCombo_Base.cs b/XIVAutoAction/Combos/Basic/DRKCombo_Base.cs
@@ -7,7 +7,7 @@
 using XIVAutoAttack.Helpers;
 
 namespace XIVAutoAttack.Combos.Basic;
-internal abstract class DRKCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class DRKCombo_Base : CustomCombo.CustomCombo
 {
     private static DRKGauge JobGauge => Service.JobGauges.Get<DRKGauge>();
     protected static ushort DarksideTimeRemaining => JobGauge.DarksideTimeRemaining;

diff --git a/XIVAutoAction/Combos/Basic/GNBCombo_Base.cs b/XIVAutoAction/Combos/Basic/GNBCombo_Base.cs
@@ -9,7 +9,7 @@
 namespace XIVAutoAttack.Combos.Basic;
 
 
-internal abstract class GNBCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class GNBCombo_Base : CustomCombo.CustomCombo
 {
     private static GNBGauge JobGauge => Service.JobGauges.Get<GNBGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/MCHCombo_Base.cs b/XIVAutoAction/Combos/Basic/MCHCombo_Base.cs
@@ -7,7 +7,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class MCHCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class MCHCombo_Base : CustomCombo.CustomCombo
 {
     private static MCHGauge JobGauge => Service.JobGauges.Get<MCHGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/MNKCombo_Base.cs b/XIVAutoAction/Combos/Basic/MNKCombo_Base.cs
@@ -9,7 +9,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class MNKCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class MNKCombo_Base : CustomCombo.CustomCombo
 {
     private static MNKGauge JobGauge => Service.JobGauges.Get<MNKGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/NINCombo_Base.cs b/XIVAutoAction/Combos/Basic/NINCombo_Base.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class NINCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class NINCombo_Base : CustomCombo.CustomCombo
 {
     private static NINGauge JobGauge => Service.JobGauges.Get<NINGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/PLDCombo_Base.cs b/XIVAutoAction/Combos/Basic/PLDCombo_Base.cs
@@ -10,7 +10,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class PLDCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class PLDCombo_Base : CustomCombo.CustomCombo
 {
     private static PLDGauge JobGauge => Service.JobGauges.Get<PLDGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/RDMCombo_Base.cs b/XIVAutoAction/Combos/Basic/RDMCombo_Base.cs
@@ -10,7 +10,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class RDMCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class RDMCombo_Base : CustomCombo.CustomCombo
 {
     private static RDMGauge JobGauge => Service.JobGauges.Get<RDMGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/RPRCombo_Base.cs b/XIVAutoAction/Combos/Basic/RPRCombo_Base.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class RPRCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class RPRCombo_Base : CustomCombo.CustomCombo
 {
     private static RPRGauge JobGauge => Service.JobGauges.Get<RPRGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/SAMCombo_Base.cs b/XIVAutoAction/Combos/Basic/SAMCombo_Base.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class SAMCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class SAMCombo_Base : CustomCombo.CustomCombo
 {
     private static SAMGauge JobGauge => Service.JobGauges.Get<SAMGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/SCHCombo_Base.cs b/XIVAutoAction/Combos/Basic/SCHCombo_Base.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class SCHCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class SCHCombo_Base : CustomCombo.CustomCombo
 {
     private static SCHGauge JobGauge => Service.JobGauges.Get<SCHGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/SGECombo_Base.cs b/XIVAutoAction/Combos/Basic/SGECombo_Base.cs
@@ -9,7 +9,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class SGECombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class SGECombo_Base : CustomCombo.CustomCombo
 {
     private static SGEGauge JobGauge => Service.JobGauges.Get<SGEGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/SMNCombo_Base.cs b/XIVAutoAction/Combos/Basic/SMNCombo_Base.cs
@@ -7,7 +7,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class SMNCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class SMNCombo_Base : CustomCombo.CustomCombo
 {
     private static SMNGauge JobGauge => Service.JobGauges.Get<SMNGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/WARCombo_Base.cs b/XIVAutoAction/Combos/Basic/WARCombo_Base.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class WARCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class WARCombo_Base : CustomCombo.CustomCombo
 {
     private static WARGauge JobGauge => Service.JobGauges.Get<WARGauge>();
 

diff --git a/XIVAutoAction/Combos/Basic/WHMCombo_Base.cs b/XIVAutoAction/Combos/Basic/WHMCombo_Base.cs
@@ -7,7 +7,7 @@
 
 namespace XIVAutoAttack.Combos.Basic;
 
-internal abstract class WHMCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+internal abstract class WHMCombo_Base : CustomCombo.CustomCombo
 {
     private static WHMGauge JobGauge => Service.JobGauges.Get<WHMGauge>();
 

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_Ability.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_Ability.cs
@@ -9,7 +9,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo;
 
-internal abstract partial class CustomCombo<TCmd> where TCmd : Enum
+internal abstract partial class CustomCombo
 {
     private bool Ability(byte abilityRemain, IAction nextGCD, out IAction act, bool helpDefenseAOE, bool helpDefenseSingle)
     {

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_Actions.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_Actions.cs
@@ -9,7 +9,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> : ICustomCombo where TCmd : Enum
+    internal abstract partial class CustomCombo
     {
         internal class RoleAction : BaseAction
         {

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_BasicInfo.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_BasicInfo.cs
@@ -11,7 +11,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> : ICustomCombo where TCmd : Enum
+    internal abstract partial class CustomCombo : ICustomCombo
     {
         public abstract ClassJobID[] JobIDs { get; }
 
@@ -65,13 +65,6 @@ public bool IsEnabled
                 }
             }
         }
-        public string Description => string.Join('\n', DescriptionDict.Select(pair => pair.Key.ToName() + " → " + pair.Value));
-
-        /// <summary>
-        /// 说明字典
-        /// </summary>
-        public virtual SortedList<DescType, string> DescriptionDict { get; } = new SortedList<DescType, string>();
-
         /// <summary>
         /// 有即刻相关Buff
         /// </summary>

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_BreakItems.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_BreakItems.cs
@@ -5,7 +5,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> where TCmd : Enum
+    internal abstract partial class CustomCombo
     {
         private static readonly BaseItem
             //刚力

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_GCD.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_GCD.cs
@@ -8,7 +8,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> where TCmd : Enum
+    internal abstract partial class CustomCombo
     {
         private IAction GCD(byte abilityRemain, bool helpDefenseAOE, bool helpDefenseSingle)
         {

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_HelpInfo.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_HelpInfo.cs
@@ -1,64 +1,25 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> where TCmd : Enum
+    internal abstract partial class CustomCombo
     {
-        protected TCmd LastCommand { get; private set; } = default(TCmd);
-
-        DateTime _lactCommandTime = DateTime.Now;
-        protected TimeSpan LastCommandElapsed => DateTime.Now - _lactCommandTime;
-
-        public Dictionary<string, string> CommandShow
-        {
-            get
-            {
-                var dict = new Dictionary<string, string>();
-                foreach (var pair in CommandDescription)
-                {
-                    dict[pair.Key.ToString()] = pair.Value;
-                }
-                return dict;
-            }
-        }
+        public string Description => string.Join('\n', DescriptionDict.Select(pair => pair.Key.ToName() + " → " + pair.Value));
 
         /// <summary>
-        /// 命令说明
+        /// Description about the actions.
         /// </summary>
-        protected virtual SortedList<TCmd, string> CommandDescription { get; } = new SortedList<TCmd, string>();
+        public virtual SortedList<DescType, string> DescriptionDict { get; } = new SortedList<DescType, string>();
 
+        DateTime _lactCommandTime = DateTime.Now;
+        protected TimeSpan LastCommandElapsed => DateTime.Now - _lactCommandTime;
 
         /// <summary>
         /// 有什么是需要每一帧进行更新数据用的，放这里。如果有自定义字段，需要在此函数内全部更新一遍。
         /// </summary>
         private protected virtual void UpdateInfo() { }
 
-        /// <summary>
-        /// 如果有Override就一定要返回一点字符串！
-        /// </summary>
-        /// <param name="args"></param>
-        /// <returns></returns>
-        public string OnCommand(string args)
-        {
-            foreach (TCmd value in Enum.GetValues(typeof(TCmd)))
-            {
-                var name = Enum.GetName(typeof(TCmd), value);
-
-                if (string.IsNullOrEmpty(name)) continue;
-
-                if (name == args)
-                {
-                    LastCommand = value;
-                    _lactCommandTime = DateTime.Now;
-
-                    if (!CommandDescription.TryGetValue(value, out var desc) || string.IsNullOrEmpty(desc))
-                        desc = value.ToString();
-                    return $"成功执行\"{desc}\"";
-                }
-            }
-
-            return string.Empty;
-        }
     }
 }
diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_Invoke.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_Invoke.cs
@@ -10,7 +10,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> where TCmd : Enum
+    internal abstract partial class CustomCombo
     {
         public bool TryInvoke(out IAction newAction)
         {

diff --git a/XIVAutoAction/Combos/CustomCombo/CustomCombo_OtherInfo.cs b/XIVAutoAction/Combos/CustomCombo/CustomCombo_OtherInfo.cs
@@ -12,7 +12,7 @@
 
 namespace XIVAutoAttack.Combos.CustomCombo
 {
-    internal abstract partial class CustomCombo<TCmd> where TCmd : Enum
+    internal abstract partial class CustomCombo
     {
         /// <summary>
         /// 玩家

diff --git a/XIVAutoAction/Combos/CustomCombo/ICustomCombo.cs b/XIVAutoAction/Combos/CustomCombo/ICustomCombo.cs
@@ -21,7 +21,6 @@ internal interface ICustomCombo : IEnableTexture
         BattleChara MoveTarget { get; }
 
         SortedList<DescType, string> DescriptionDict { get; }
-        Dictionary<string, string> CommandShow { get; }
         IAction[] AllActions { get; }
         PropertyInfo[] AllBools { get; }
         PropertyInfo[] AllBytes { get; }
@@ -30,7 +29,7 @@ internal interface ICustomCombo : IEnableTexture
         MethodInfo[] AllLast { get; }
         MethodInfo[] AllOther { get; }
         MethodInfo[] AllGCDs { get; }
-        string OnCommand(string args);
+
         bool TryInvoke(out IAction newAction);
     }
 }
diff --git a/XIVAutoAction/Combos/Healer/ASTCombos/ASTCombo_Default.cs b/XIVAutoAction/Combos/Healer/ASTCombos/ASTCombo_Default.cs
@@ -11,22 +11,12 @@
 
 namespace XIVAutoAttack.Combos.Healer.ASTCombos;
 
-internal sealed class ASTCombo_Default : ASTCombo_Base<CommandType>
+internal sealed class ASTCombo_Default : ASTCombo_Base
 {
     public override string GameVersion => "6.28";
 
     public override string Author => "汐ベMoon";
 
-    internal enum CommandType : byte
-    {
-        None,
-    }
-
-    protected override SortedList<CommandType, string> CommandDescription => new SortedList<CommandType, string>()
-    {
-        //{CommandType.None, "" }, //写好注释啊！用来提示用户的。
-    };
-
     public override SortedList<DescType, string> DescriptionDict => new()
     {
         {DescType.HealArea, $"GCD: {AspectedHelios}, {Helios}\n                     能力: {EarthlyStar}, {CrownPlay}, {CelestialOpposition}"},
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ internal enum BLUID : byte @@
             DPS,
         }
-        internal abstract class BLUCombo_Base<TCmd> : CustomCombo<TCmd> where TCmd : Enum
+        internal abstract class BLUCombo_Base : CustomCombo.CustomCombo
         {
             internal enum BLUAttackType : byte
             {
@@ Expand Down @@