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

Commit

Permalink
fix: add a random place for Beneficial Area
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Aug 21, 2023
1 parent ba1c311 commit 89e001f
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 5 deletions.
8 changes: 7 additions & 1 deletion Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -384,5 +384,11 @@
33497,
33490,
33494,
32113
32113,
11157,
11178,
11185,
11528,
651,
3738
]
10 changes: 8 additions & 2 deletions RotationSolver.Basic/Actions/BaseAction_Target.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ private bool TargetAreaMove(float range, bool mustUse)
var camera = CameraManager.Instance()->CurrentCamera;
var tar = camera->LookAtVector - camera->Object.Position;
tar.Y = 0;
tar = tar / ((Vector3)tar).Length() * range;
var length = ((Vector3)tar).Length();
if (length == 0) return false;
tar = tar / length * range;
Position = new Vector3(pPosition.X + tar.X, pPosition.Y,
pPosition.Z + tar.Z);
}
Expand Down Expand Up @@ -202,7 +204,11 @@ private bool TargetAreaFriend(float range, bool mustUse, PlayerCharacter player)
&& pts != null && pts.Length > 0)
{
var closest = pts.MinBy(p => Vector3.Distance(player.Position, p));
if(Vector3.Distance(player.Position, closest) < player.HitboxRadius + EffectRange)
var rotation = new Random().NextDouble() * Math.Tau;
var radius = new Random().NextDouble() * 1;
closest.X += (float)(Math.Sin(rotation) * radius);
closest.Z += (float)(Math.Cos(rotation) * radius);
if (Vector3.Distance(player.Position, closest) < player.HitboxRadius + EffectRange)
{
Position = closest;
return true;
Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/Localization/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -350,15 +350,15 @@ internal partial class Strings
public string SpecialCommandType_Burst { get; set; } = "Burst";
public string SpecialCommandType_EndSpecial { get; set; } = "End Special";
public string SpecialCommandType_Speed { get; set; } = "Speed";
public string SpecialCommandType_Smart { get; set; } = "Auto Target ";
public string SpecialCommandType_Smart { get; set; } = "Auto Target";
public string SpecialCommandType_Manual { get; set; } = "Manual Target";
public string SpecialCommandType_Cancel { get; set; } = "Cancel";
public string SpecialCommandType_Off { get; set; } = "Off";
#endregion

#region ActionConditionType
public string ActionConditionType_Elapsed { get; set; } = "Elapsed";
public string ActionConditionType_ElapsedGCD { get; set; } = "ElapsedG CD ";
public string ActionConditionType_ElapsedGCD { get; set; } = "Elapsed GCD";
public string ActionConditionType_Remain { get; set; } = "Remain Time";
public string ActionConditionType_RemainGCD { get; set; } = "Remain GCD";
public string ActionConditionType_ShouldUse { get; set; } = "Can Use";
Expand Down

0 comments on commit 89e001f

Please sign in to comment.