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

Commit

Permalink
fix: fixed drawing.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Feb 18, 2024
1 parent 4b7b457 commit 521be06
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 9 deletions.
2 changes: 2 additions & 0 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,8 @@
"7439": 0.6,
"7442": 0.1,
"7443": 0.6,
"7444": 0.6,
"7445": 0.6,
"7447": 0.1,
"7477": 0.6,
"7478": 0.6,
Expand Down
6 changes: 5 additions & 1 deletion Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -480,5 +480,9 @@
30287,
30288,
28907,
24189
24189,
35948,
35331,
10827,
10799
]
4 changes: 2 additions & 2 deletions Resources/RotationSolverRecord.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ClickingCount": 63171,
"SayingHelloCount": 13,
"ClickingCount": 63570,
"SayingHelloCount": 36,
"SaidUsers": []
}
5 changes: 2 additions & 3 deletions RotationSolver.Basic/Helpers/ObjectHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,8 @@ public static unsafe bool IsEnemy(this GameObject obj)
/// <param name="obj"></param>
/// <returns></returns>
public static unsafe bool IsAlliance(this GameObject obj)
=> obj != null
&& (ActionManager.CanUseActionOnTarget((uint)ActionID.CurePvE, obj.Struct())
|| ActionManager.CanUseActionOnTarget((uint)ActionID.RaisePvE, obj.Struct()));
=> obj != null && obj.ObjectId is not 0 and not GameObject.InvalidGameObjectId
&& ActionManager.CanUseActionOnTarget((uint)ActionID.CurePvE, obj.Struct());

public static bool IsParty(this GameObject gameObject)
{
Expand Down
24 changes: 23 additions & 1 deletion RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,26 @@
{
"RotationSolver.Data.UiString.ConfigWindowHeader": "Rotation Solver Settings v",
"RotationSolver.Data.UiString.Commands_Rotation": "Open config window."
"RotationSolver.Data.UiString.Commands_Rotation": "Open config window.",
"RotationSolver.Basic.Data.StateCommandType.Manual": "Start the addon in Manual mode. You need to choose the target manually. This will bypass any engage settings that you have set up and will start attacking immediately once something is targeted.",
"RotationSolver.Basic.Data.StateCommandType.Cancel": "Stop the addon. Always remember to turn it off when it is not in use!",
"RotationSolver.Basic.Data.StateCommandType.Auto": "Start the addon in Auto mode. When out of combat or when combat starts, switches the target according to the set condition.",
"RotationSolver.Basic.Data.TargetingType.Big": "Big",
"RotationSolver.Data.UiString.InfoWindowNoMove": "No Move",
"RotationSolver.Data.UiString.InfoWindowMove": "Move",
"RotationSolver.Basic.Data.SpecialCommandType.HealArea": "Open a window to use AoE heal.",
"RotationSolver.Basic.Data.SpecialCommandType.HealSingle": "Open a window to use single heal.",
"RotationSolver.Basic.Data.SpecialCommandType.DefenseArea": "Open a window to use AoE defense.",
"RotationSolver.Basic.Data.SpecialCommandType.DefenseSingle": "Open a window to use single defense.",
"RotationSolver.Basic.Data.SpecialCommandType.MoveForward": "Open a window to move forward.",
"RotationSolver.Basic.Data.SpecialCommandType.MoveBack": "Open a window to move back.",
"RotationSolver.Basic.Data.SpecialCommandType.Burst": "Open a window to burst.",
"RotationSolver.Basic.Data.SpecialCommandType.EndSpecial": "To end this special duration before the set time.",
"RotationSolver.Basic.Data.SpecialCommandType.DispelStancePositional": "Open a window to use Esuna, tank stance actions or True North.",
"RotationSolver.Basic.Data.SpecialCommandType.RaiseShirk": "Open a window to use Raise or Shirk.",
"RotationSolver.Basic.Data.SpecialCommandType.AntiKnockback": "Open a window to use knockback immunity actions.",
"RotationSolver.Basic.Data.SpecialCommandType.Speed": "Open a window to speed up.",
"RotationSolver.Basic.Data.TargetHostileType.TargetsHaveTarget": "Previously engaged targets (engages on countdown timer)",
"RotationSolver.Data.UiString.ActionAbility": "Ability",
"RotationSolver.Data.UiString.ActionAttack": "Attack",
"RotationSolver.Data.UiString.ActionFriendly": "Friendly"
}
5 changes: 4 additions & 1 deletion RotationSolver/UI/PainterManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,10 @@ public static void Init()
},
};

_painter.AddDrawings(_highLight, _stateImage, annulus, movingTarget, new TargetDrawing(), new TargetsDrawing(), new TargetText(), new BeneficialPositionDrawing());
_painter.AddDrawings(
_highLight, _stateImage,new TargetDrawing(), annulus, movingTarget,
new TargetsDrawing(), new TargetText(), new BeneficialPositionDrawing()
);
}

public static void UpdateSettings()
Expand Down
2 changes: 1 addition & 1 deletion XIVPainter

0 comments on commit 521be06

Please sign in to comment.