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

Commit

Permalink
fix: fixed null exception in ObjectHelper.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jun 15, 2023
1 parent 4d90cb2 commit 6be0386
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 5 deletions.
7 changes: 7 additions & 0 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
{
"9": 0.6,
"15": 0.6,
"16": 0.6,
"17": 0.6,
"20": 0.6,
"22": 0.6,
"23": 0.6,
"24": 0.6,
"28": 0.6,
"31": 0.6,
"37": 0.6,
"40": 0.6,
Expand Down Expand Up @@ -135,6 +139,7 @@
"4639": 0.6,
"4868": 2.1,
"6993": 2.1,
"7381": 0.6,
"7383": 0.6,
"7384": 0.1,
"7386": 0.6,
Expand Down Expand Up @@ -255,6 +260,8 @@
"16163": 0.6,
"16164": 0.6,
"16165": 0.6,
"16457": 0.6,
"16458": 0.6,
"16459": 0.6,
"16461": 0.6,
"16462": 0.6,
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Helpers/ObjectHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static unsafe bool IsOthersPlayers(this GameObject obj)
}

public static unsafe bool IsNPCEnemy(this GameObject obj)
=> obj.GetObjectKind() == ObjectKind.BattleNpc
=> obj != null && obj.GetObjectKind() == ObjectKind.BattleNpc
&& ActionManager.CanUseActionOnTarget((uint)ActionID.Blizzard, obj.GetAddress());


Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Rotations/Basic/BLM_Base.cs
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public override bool CanUse(out IAction act, CanUseOption option = CanUseOption.
#endregion

#region Support
public static IBaseAction AetherialManipulation { get; } = new BaseAction(ActionID.AetherialManipulation, ActionOption.Friendly)
public static IBaseAction AetherialManipulation { get; } = new BaseAction(ActionID.AetherialManipulation, ActionOption.Friendly | ActionOption.EndSpecial)
{
ChoiceTarget = TargetFilter.FindTargetForMoving,
};
Expand Down
4 changes: 3 additions & 1 deletion RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@
"ConfigWindow_Events_DutyStart": "Duty Start: ",
"ConfigWindow_Events_DutyEnd": "Duty End: ",
"ConfigWindow_Params_Description": "In this window, you can set the parameters about the using way of actions.",
"ConfigWindow_Param_UseOverlayWindow": "Display Top Overlay",
"ConfigWindow_Param_UseOverlayWindowDesc": "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc.",
"ConfigWindow_Param_Basic": "Basic",
"ConfigWindow_Param_ActionAhead": "Set the time advance of using actions",
"ConfigWindow_Param_MinLastAbilityAdvanced": "Set min the time advance of using the last 0gcd.",
Expand Down Expand Up @@ -97,8 +99,8 @@
"ConfigWindow_Param_ToastPositional": "Hint positional anticipation by Toast",
"ConfigWindow_Param_SayPositional": "Hint positional anticipation by shouting",
"ConfigWindow_Param_DrawPositional": "Draw Positional on the screen",
"ConfigWindow_Param_DrawMeleeRange": "Draw the range of melee on the screen",
"ConfigWindow_Param_DrawMeleeOffset": "Draw the offset of melee on the screen",
"ConfigWindow_Param_AlphaInFill": "The alpha value in fill.",
"ConfigWindow_Param_ShowMoveTarget": "Show the target of the move action",
"ConfigWindow_Param_ShowTarget": "Show Target",
"ConfigWindow_Param_SayOutStateChanged": "Saying the state changes out",
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver/UI/PainterManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public override void UpdateOnFrame(XIVPainter.XIVPainter painter)
var ratio = (float)DrawingHelper.EaseFuncRemap(EaseFuncType.None, EaseFuncType.Cubic)(d);

List<IDrawing3D> subItems = new List<IDrawing3D>() { _target,
new Drawing3DImage(act.GetTexture(), act.Target.Position)
new Drawing3DImage(act.GetTexture(), act.Target.Position, 0.2f)
};

_target.Color = ImGui.GetColorU32(Service.Config.TargetColor);
Expand Down
2 changes: 1 addition & 1 deletion XIVPainter

0 comments on commit 6be0386

Please sign in to comment.