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

Commit

Permalink
fix: feint target.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Feb 25, 2024
1 parent 6a5998c commit 9b04b04
Show file tree
Hide file tree
Showing 7 changed files with 40 additions and 13 deletions.
3 changes: 2 additions & 1 deletion Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -506,5 +506,6 @@
11464,
11612,
11306,
11308
11308,
33139
]
4 changes: 2 additions & 2 deletions Resources/RotationSolverRecord.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ClickingCount": 77828,
"SayingHelloCount": 67,
"ClickingCount": 81534,
"SayingHelloCount": 72,
"SaidUsers": []
}
19 changes: 18 additions & 1 deletion RotationSolver.Basic/Actions/ActionSetting.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,24 @@ public class ActionSetting()
private TargetType _type = TargetType.Big;
public TargetType TargetType
{
get => IBaseAction.TargetOverride ?? _type;
get
{
var type = IBaseAction.TargetOverride ?? _type;
if (IsFriendly)
{

}
else
{
switch (type)
{
case TargetType.BeAttacked:
return _type;
}
}

return type;
}
set => _type = value;
}

Expand Down
12 changes: 6 additions & 6 deletions RotationSolver.Basic/Actions/ActionTargetInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -557,12 +557,12 @@ private readonly bool CanGetTarget(GameObject target, GameObject subTarget)

BattleChara? FindTargetForMoving()
{
if (!IBaseAction.ActionPreview && !DataCenter.MergedStatus.HasFlag(AutoStatus.MoveForward))
{
var o = gameObjects.MinBy(b => b.DistanceToPlayer());
if (o.DistanceToPlayer() < 1) return o;
return null;
}
//if (!IBaseAction.ActionPreview && !DataCenter.MergedStatus.HasFlag(AutoStatus.MoveForward))
//{
// var o = gameObjects.MinBy(b => b.DistanceToPlayer());
// if (o.DistanceToPlayer() < 1) return o;
// return null;
//}

const float DISTANCE_TO_MOVE = 3;

Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Configuration/Configs.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public const string
private static readonly bool _showTarget = true;

[ConditionBool, UI("Show the target's time to kill.",
Parent = UiOverlay)]
Parent = nameof(ShowTarget))]
private static readonly bool _showTargetTimeToKill = false;

[ConditionBool, UI("Priority attack targets with attack markers",
Expand Down
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Rotations/CustomRotation_Ability.cs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private bool Ability(IAction nextGCD, out IAction? act)
if (DataCenter.MergedStatus.HasFlag(AutoStatus.Positional) && role == JobRole.Melee
&& !(Player?.HasStatus(false, StatusHelper.NoPositionalStatus) ?? true))
{
if (TrueNorthPvE.CanUse(out act, isEmpty: true)) return true;
if (TrueNorthPvE.CanUse(out act, isEmpty: true, onLastAbility: true)) return true;
}

IBaseAction.TargetOverride = TargetType.Heal;
Expand Down
11 changes: 10 additions & 1 deletion RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,14 @@
"DownloadRotationsName": "Auto Download Rotations",
"AutoLoadCustomRotationsName": "Auto load rotations",
"RotationSolver.Data.UiString.ConfigWindow_Rotations_Library": "The folder contains rotation libs or the download url about rotation lib.",
"RotationSolver.Data.UiString.SpecialCommandType_LimitBreak": "Limit Break"
"RotationSolver.Data.UiString.SpecialCommandType_LimitBreak": "Limit Break",
"UseOverlayWindowDescription": "This top window is used to display some extra information on your game window, such as target's positional, target and sub-target, etc.",
"DrawingHeightName": "The height of the drawing things.",
"SampleLengthName": "Drawing smoothness.",
"BeneficialPositionColorName": "The color of beneficial AoE positions",
"HoveredBeneficialPositionColorName": "The color of the hovered beneficial position",
"StateIconHeightName": "State icon height",
"StateIconSizeName": "State icon size",
"TargetIconSizeName": "The size of the next ability that will be used icon.",
"ShowTargetTimeToKillName": "Show the target's time to kill."
}

0 comments on commit 9b04b04

Please sign in to comment.