Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: fixed friendly aoe omen. and timeline drawing.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Mar 8, 2024
1 parent b5fcd8d commit 477973e
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ internal class StaticDrawingGetter : BaseDrawingGetter
public string Path { get; set; } = GroundOmenHostile.Circle.Omen();
public Vector3 Position { get; set; }
public float Rotation { get; set; }
public Vector3 Scale { get; set; }
public Vector3 Scale { get; set; } = Vector3.Zero;
public bool PlaceOnObject { get; set; } = false;
public ObjectGetter ObjectGetter { get; set; } = new();
public TextDrawing Text { get; set; } = new();
Expand Down
19 changes: 18 additions & 1 deletion RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -374,5 +374,22 @@
"RotationSolver.Basic.Configuration.Timeline.MoveTimelineItem": "Move Time line",
"RotationSolver.Basic.Configuration.Timeline.TimelineCondition.TimelineConditionSet": "Condition Set",
"RotationSolver.Basic.Configuration.Timeline.TimelineCondition.TimelineConditionAction": "Action Condition",
"RotationSolver.Basic.Configuration.Timeline.TimelineCondition.TimelineConditionTargetCount": "Target Count Condition"
"RotationSolver.Basic.Configuration.Timeline.TimelineCondition.TimelineConditionTargetCount": "Target Count Condition",
"RotationSolver.Data.UiString.TimelineRaidTime": "Raid Time",
"RotationSolver.Data.UiString.TimelineExecute": "Execute",
"RotationSolver.Data.UiString.TimelineDuration": "Duration",
"RotationSolver.Data.UiString.TimelineTargetCount": "Target Count",
"RotationSolver.Data.UiString.TimelineTargetGetter": "Target Getter",
"RotationSolver.Data.UiString.TimelineEffectDuration": "Effect Duration",
"RotationSolver.Data.UiString.TimelineGround": "Ground",
"RotationSolver.Data.UiString.TimelineActor": "Actor",
"RotationSolver.Data.UiString.TimelineRotation": "Rotation",
"RotationSolver.Data.UiString.TimelinePosition": "Position",
"RotationSolver.Data.UiString.TimelineScale": "Scale",
"RotationSolver.Data.UiString.TimelineObjectGetter": "Object Getter",
"RotationSolver.Data.UiString.TimelineShowText": "Showing Text",
"RotationSolver.Data.UiString.TimelineNeedATarget": "Need a target",
"RotationSolver.Data.UiString.TimelineTargetByTarget": "Target by target",
"RotationSolver.Data.UiString.TimelinePlaceOnTarget": "Place On Target",
"RotationSolver.Data.UiString.TimelinePositionOffset": "Position Offset"
}
28 changes: 19 additions & 9 deletions RotationSolver/UI/TimelineDrawer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,14 @@ void AddOneCondition<T>() where T : BaseTimelineItem

private static void DrawTimelineItem(BaseTimelineItem timeLineItem, TimelineItem item)
{
var isOpen = _openedTab == timeLineItem.GetHashCode();
if (ImGuiEx.IconButton(FontAwesomeIcon.Cog, "Condition icon." + timeLineItem.GetHashCode()))
{
_openedTab = isOpen ? 0 : timeLineItem.GetHashCode();
}

ImGui.SameLine();

var time = timeLineItem.Time;
if (ConditionDrawer.DrawDragFloat(ConfigUnitType.Seconds, $" ##Time{timeLineItem.GetHashCode()}", ref time))
{
Expand Down Expand Up @@ -360,6 +368,8 @@ void Down()
}
}

if (!isOpen) return;

ImGui.Spacing();
ImGui.Spacing();

Expand Down Expand Up @@ -669,26 +679,26 @@ void AddOneCondition<T>() where T : ITimelineCondition
private static IDisposable[]? _previewItems = null;
static int _openedTab = 0;
private static void DrawingGetterDraw(BaseDrawingGetter drawing, uint[] actionIds)
{
var name = drawing.Name;
ImGui.SetNextItemWidth(300 * Scale);
if (ImGui.InputText(UiString.ConfigWindow_Timeline_Name.Local() + "##" + drawing.GetHashCode(), ref name, 256))
{
var enable = drawing.Enable;
if(ImGui.Checkbox("##Enable" + drawing.GetHashCode(), ref enable))
{
drawing.Name = name;
drawing.Enable = enable;
}

ImGui.SameLine();

var enable = drawing.Enable;
if(ImGui.Checkbox("##Enable" + drawing.GetHashCode(), ref enable))
var name = drawing.Name;
ImGui.SetNextItemWidth(300 * Scale);
if (ImGui.InputText("##" + drawing.GetHashCode(), ref name, 256))
{
drawing.Enable = enable;
drawing.Name = name;
}

ImGui.SameLine();

var isOpen = _openedTab == drawing.GetHashCode();
if (ImGuiEx.IconButton(FontAwesomeIcon.Cog))
if (ImGuiEx.IconButton(FontAwesomeIcon.Cog, "Config icon." + drawing.GetHashCode()))
{
_openedTab = isOpen ? 0 : drawing.GetHashCode();
}
Expand Down
3 changes: 1 addition & 2 deletions RotationSolver/Updaters/ActionUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ internal static IBaseAction? NextGCDAction
circle.Owner = sector.Owner = rectangle.Owner = player;

if (value == null) return;
var target = value.Target?.Target;
if (target == null) return;
var target = value.Target?.Target ?? player;

var range = value.Action.EffectRange;
var size = new Vector3(range, gcdHeight, range);
Expand Down

0 comments on commit 477973e

Please sign in to comment.