diff --git a/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs b/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs index a3d72c4..807f6cf 100644 --- a/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs +++ b/ActionTimelineEx/Configurations/Actions/ActionSettingAttribute.cs @@ -25,7 +25,9 @@ public override string DrawIndex(object obj, int index) var recastTime = Svc.Data.GetExcelSheet()?.GetRow(setting.ActionId)?.Recast100ms ?? 0; - var time = Plugin.Settings.RotationHelper.GcdTime / 2.5f * recastTime / 10f; + var time = setting.GcdOverride == 0 + ? Plugin.Settings.RotationHelper.GcdTime / 2.5f * recastTime / 10f + : setting.GcdOverride; _time = _time.Add(TimeSpan.FromSeconds(time)); return result; diff --git a/ActionTimelineEx/Configurations/Actions/GCDAction.cs b/ActionTimelineEx/Configurations/Actions/GCDAction.cs index a81ca32..aae6d32 100644 --- a/ActionTimelineEx/Configurations/Actions/GCDAction.cs +++ b/ActionTimelineEx/Configurations/Actions/GCDAction.cs @@ -11,14 +11,14 @@ public class GCDAction : ActionSetting { internal override ActionSettingType Type => ActionSettingType.Action; - //[JsonIgnore] - //[Range(0, 20, ConfigUnitType.Seconds)] - //[UI("Recast time override")] - //public float GcdOverride - //{ - // get => Plugin.Settings.ActionRecast.TryGetValue(ActionId, out var v) ? v : 0f; - // set => Plugin.Settings.ActionRecast[ActionId] = value; - //} + [JsonIgnore] + [Range(0, 20, ConfigUnitType.Seconds)] + [UI("Recast time override")] + public float GcdOverride + { + get => Plugin.Settings.ActionRecast.TryGetValue(ActionId, out var v) ? v : 0f; + set => Plugin.Settings.ActionRecast[ActionId] = value; + } [UI] public List oGCDs { get; set; } = []; diff --git a/ActionTimelineEx/Configurations/Settings.cs b/ActionTimelineEx/Configurations/Settings.cs index 7b71fe0..c715b3c 100644 --- a/ActionTimelineEx/Configurations/Settings.cs +++ b/ActionTimelineEx/Configurations/Settings.cs @@ -144,7 +144,7 @@ internal RotationsSetting RotationHelper private static readonly RotationsSetting EmptyHolder = new(); - //public Dictionary ActionRecast { get; set; } = []; + public Dictionary ActionRecast { get; set; } = []; public int Version { get; set; } = 6;