fix: fixed event showing.

ArchiDog1998 · May 7, 2023 · d4a4d2a · d4a4d2a
1 parent c28aeda
commit d4a4d2a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 134 deletions.
diff --git a/Resources/AnimationLockTime.json b/Resources/AnimationLockTime.json
@@ -50,6 +50,7 @@
   "159": 0.1,
   "162": 0.1,
   "167": 0.6,
+  "173": 0.6,
   "181": 0.6,
   "185": 0.1,
   "190": 0.1,
@@ -80,11 +81,11 @@
   "3593": 0.6,
   "3594": 0.1,
   "3595": 0.6,
-  "3596": 0.1,
+  "3596": 0.6,
   "3598": 0.1,
   "3599": 0.6,
   "3600": 0.1,
-  "3601": 0.1,
+  "3601": 0.6,
   "3603": 0.6,
   "3606": 0.6,
   "3608": 0.6,
@@ -121,6 +122,7 @@
   "7431": 0.1,
   "7432": 0.6,
   "7439": 0.6,
+  "7442": 0.1,
   "7447": 0.1,
   "7503": 0.1,
   "7505": 0.6,
@@ -187,6 +189,7 @@
   "16507": 0.6,
   "16508": 0.6,
   "16510": 0.6,
+  "16511": 0.1,
   "16514": 0.6,
   "16524": 0.1,
   "16525": 0.1,
@@ -197,6 +200,7 @@
   "16553": 0.6,
   "16926": 0.1,
   "17215": 0.1,
+  "17527": 2.1,
   "19002": 0.6,
   "19004": 0.6,
   "19010": 0.6,
@@ -208,6 +212,7 @@
   "21910": 2.1,
   "22411": 1.1,
   "22605": 2.1,
+  "24222": 2.1,
   "24283": 0.1,
   "24284": 0.1,
   "24285": 0.6,
@@ -252,6 +257,9 @@
   "25798": 0.1,
   "25799": 0.6,
   "25801": 0.6,
+  "25805": 0.6,
+  "25806": 0.6,
+  "25807": 0.6,
   "25820": 0.6,
   "25826": 0.1,
   "25830": 0.6,
@@ -264,6 +272,7 @@
   "25865": 0.1,
   "25870": 0.6,
   "25885": 0.6,
+  "26798": 2.1,
   "31323": 2.1,
   "33041": 2.1
 }
diff --git a/Resources/HostileCastingArea.json b/Resources/HostileCastingArea.json
@@ -7,19 +7,30 @@
   3676,
   3691,
   3696,
+  4013,
   4116,
   4126,
   4135,
   4149,
   4162,
   4323,
+  4855,
+  4918,
+  5919,
+  5928,
   6469,
   6547,
+  6604,
+  6607,
+  6613,
+  6887,
   8023,
   8024,
   8025,
   8028,
   8039,
+  8367,
+  8581,
   9523,
   13262,
   13314,

diff --git a/RotationSolver.Basic/Data/ClassJobIDs.cs b/RotationSolver.Basic/Data/ClassJobIDs.cs
@@ -2,193 +2,63 @@
 
 public enum ClassJobID : uint
 {
-    /// <summary>
-    /// 冒险者
-    /// </summary>
     Adventurer = 0,
 
-    /// <summary>
-    /// 剑术师
-    /// </summary>
     Gladiator = 1,
 
-    /// <summary>
-    /// 格斗家
-    /// </summary>
     Pugilist = 2,
 
-    /// <summary>
-    /// 斧术师
-    /// </summary>
     Marauder = 3,
 
-    /// <summary>
-    /// 枪术师
-    /// </summary>
     Lancer = 4,
 
-    /// <summary>
-    /// 弓箭手
-    /// </summary>
     Archer = 5,
 
-    /// <summary>
-    /// 幻术师
-    /// </summary>
     Conjurer = 6,
 
-    /// <summary>
-    /// 咒术师
-    /// </summary>
     Thaumaturge = 7,
 
-    /// <summary>
-    /// 刻木匠
-    /// </summary>
-    Carpenter = 8,
-
-    /// <summary>
-    /// 锻铁匠
-    /// </summary>
-    Blacksmith = 9,
-
-    /// <summary>
-    /// 铸甲匠
-    /// </summary>
-    Armorer = 10,
-
-    /// <summary>
-    /// 雕金匠
-    /// </summary>
-    Goldsmith = 11,
-
-    /// <summary>
-    /// 制革匠
-    /// </summary>
-    Leatherworker = 12,
-
-    /// <summary>
-    /// 裁衣匠
-    /// </summary>
-    Weaver = 13,
-
-    /// <summary>
-    /// 炼金术士
-    /// </summary>
-    Alchemist = 14,
-
-    /// <summary>
-    /// 烹调师
-    /// </summary>
-    Culinarian = 15,
-
-    /// <summary>
-    /// 骑士
-    /// </summary>
     Paladin = 19,
 
-    /// <summary>
-    /// 武僧
-    /// </summary>
     Monk = 20,
 
-    /// <summary>
-    /// 战士
-    /// </summary>
     Warrior = 21,
 
-    /// <summary>
-    /// 龙骑士
-    /// </summary>
     Dragoon = 22,
 
-    /// <summary>
-    /// 吟游诗人
-    /// </summary>
     Bard = 23,
 
-    /// <summary>
-    /// 白魔法师
-    /// </summary>
     WhiteMage = 24,
 
-    /// <summary>
-    /// 黑魔法师
-    /// </summary>
     BlackMage = 25,
 
-    /// <summary>
-    /// 秘术师
-    /// </summary>
     Arcanist = 26,
 
-    /// <summary>
-    /// 召唤师
-    /// </summary>
     Summoner = 27,
 
-    /// <summary>
-    /// 学者
-    /// </summary>
     Scholar = 28,
 
-    /// <summary>
-    /// 双剑师
-    /// </summary>
     Rogue = 29,
 
-    /// <summary>
-    /// 忍者
-    /// </summary>
     Ninja = 30,
 
-    /// <summary>
-    /// 机工士
-    /// </summary>
     Machinist = 31,
 
-    /// <summary>
-    /// 黑暗骑士
-    /// </summary>
     DarkKnight = 32,
 
-    /// <summary>
-    /// 占星术士
-    /// </summary>
     Astrologian = 33,
 
-    /// <summary>
-    /// 武士
-    /// </summary>
     Samurai = 34,
 
-    /// <summary>
-    /// 赤魔法师
-    /// </summary>
     RedMage = 35,
 
-    /// <summary>
-    /// 青魔法师
-    /// </summary>
     BlueMage = 36,
 
-    /// <summary>
-    /// 绝枪战士
-    /// </summary>
     Gunbreaker = 37,
 
-    /// <summary>
-    /// 舞者
-    /// </summary>
     Dancer = 38,
 
-    /// <summary>
-    /// 钐镰客
-    /// </summary>
     Reaper = 39,
 
-    /// <summary>
-    /// 贤者
-    /// </summary>
     Sage = 40,
 }
diff --git a/RotationSolver.Basic/Rotations/Basic/AST_Base.cs b/RotationSolver.Basic/Rotations/Basic/AST_Base.cs
@@ -89,7 +89,6 @@ public abstract class AST_Base : CustomRotation
 
     #endregion
 
-
     #region Support
     public static IBaseAction Lightspeed { get; } = new BaseAction(ActionID.Lightspeed);
 

diff --git a/RotationSolver/UI/RotationConfigWindow_Events.cs b/RotationSolver/UI/RotationConfigWindow_Events.cs
@@ -33,7 +33,7 @@ private static void DrawEventTab()
             ActionEventInfo remove = null;
             foreach (var eve in Service.Config.Events)
             {
-                eve.DisplayMacro();
+                eve.DisplayEvent();
 
                 ImGui.SameLine();
                 ImGuiHelper.Spacing();
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,19 +7,30 @@ @@
 ,
 ,
 ,
+,
 ,
 ,
 ,
 ,
 ,
 ,
+,
+,
+,
+,
 ,
 ,
+,
+,
+,
+,
 ,
 ,
 ,
 ,
 ,
+,
+,
 ,
 ,
 ,
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,7 +89,6 @@ public abstract class AST_Base : CustomRotation

		#endregion


		#region Support
		public static IBaseAction Lightspeed { get; } = new BaseAction(ActionID.Lightspeed);

Expand Down