diff --git a/ActionTimelineEx/ActionTimelineEx.csproj b/ActionTimelineEx/ActionTimelineEx.csproj index ad229f0..9851a50 100644 --- a/ActionTimelineEx/ActionTimelineEx.csproj +++ b/ActionTimelineEx/ActionTimelineEx.csproj @@ -5,7 +5,7 @@ ArchiTed x64 AnyCPU - 1.3.0 + 1.3.1 enable $(AppData)\XIVLauncher\addon\Hooks\dev\ true diff --git a/ActionTimelineEx/Timeline/StatusLineItem.cs b/ActionTimelineEx/Timeline/StatusLineItem.cs index ecb5be1..63e97fc 100644 --- a/ActionTimelineEx/Timeline/StatusLineItem.cs +++ b/ActionTimelineEx/Timeline/StatusLineItem.cs @@ -57,6 +57,7 @@ public void DrawItemWithCenter(Vector2 centerPos, Vector2 windowPos, DrawingSett if (rightBottom.X <= windowPos.X) return; leftTop.X = Math.Max(leftTop.X, windowPos.X); + leftTop.Y = Math.Max(leftTop.Y, windowPos.Y); drawList.AddImage(texture.ImGuiHandle, leftTop, leftTop + new Vector2(statusHeight / TimelineItem.HeightRatio, statusHeight), Vector2.Zero, Vector2.One); diff --git a/ActionTimelineEx/Timeline/TimelineManager.cs b/ActionTimelineEx/Timeline/TimelineManager.cs index 6cf0ca0..2b40e13 100644 --- a/ActionTimelineEx/Timeline/TimelineManager.cs +++ b/ActionTimelineEx/Timeline/TimelineManager.cs @@ -453,31 +453,13 @@ private unsafe void OnCast(uint sourceId, IntPtr ptr) var actionId = *(ushort*)ptr; - string name = string.Empty; - ushort icon = 0; var action = Svc.Data.GetExcelSheet()?.GetRow(actionId); - if(action?.Cast100ms > 0) - { - name = action?.Name ?? string.Empty; - icon = actionId == 4 ? (ushort)118 //Mount - : action?.Icon ?? 0; - } - else - { - var item = Svc.Data.GetExcelSheet()?.GetRow(actionId); - if (item?.CastTimes > 0) - { - name = item?.Name ?? string.Empty; - icon = item?.Icon ?? 0; - } - } - - AddItem(new TimelineItem() { - Name = name, - Icon = icon, + Name = action?.Name ?? string.Empty, + Icon = actionId == 4 ? (ushort)118 //Mount + : action?.Icon ?? 0, StartTime = DateTime.Now, GCDTime = GCD, CastingTime = Player.Object.TotalCastTime - Player.Object.CurrentCastTime,