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

Commit

Permalink
fix: DataCenter and Service are changed to Internal.
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Jul 11, 2023
1 parent 6e03752 commit 152224a
Show file tree
Hide file tree
Showing 10 changed files with 27 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<TargetFramework>net7.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Authors>ArchiTed</Authors>
<Version>3.0.8</Version>
<Version>3.0.8.1</Version>
<PlatformTarget>x64</PlatformTarget>
<Platforms>AnyCPU</Platforms>

Expand Down
2 changes: 1 addition & 1 deletion Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@
"25788": 0.6,
"25793": 0.1,
"25796": 0.6,
"25797": 0.6,
"25797": 0.1,
"25798": 0.1,
"25799": 0.6,
"25801": 0.6,
Expand Down
3 changes: 1 addition & 2 deletions RotationSolver.Basic/Helpers/ConfigurationHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

namespace RotationSolver.Basic.Helpers;

public static class ConfigurationHelper
internal static class ConfigurationHelper
{
public static readonly SortedList<ActionID, EnemyPositional> ActionPositional = new()
{
Expand Down Expand Up @@ -57,7 +57,6 @@ public static float GetHealthSingleAbilityHot(this Job job)
public static float GetHealthSingleSpellHot(this Job job)
=> Service.Config.HealthSingleSpellsHot.TryGetValue(job, out var value) ? value : Service.Config.HealthSingleSpellHot;


public static float GetHealthForDyingTank(this Job job)
=> Service.Config.HealthForDyingTanks.TryGetValue(job, out var value) ? value : HealthForDyingTanksDefault;

Expand Down
14 changes: 14 additions & 0 deletions RotationSolver.Basic/Rotations/CustomRotation_OtherInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using Dalamud.Game.ClientState.Conditions;
using Dalamud.Game.ClientState.Objects.SubKinds;
using ECommons.DalamudServices;
using RotationSolver.Basic.Helpers;

namespace RotationSolver.Basic.Rotations;
public abstract partial class CustomRotation
Expand Down Expand Up @@ -266,4 +267,17 @@ protected static float GCDTime(uint gcdCount = 0, float offset = 0)

protected static int NumberOfHostilesIn(float range)
=> DataCenter.HostileTargets.Count(o => o.DistanceToPlayer() <= range);

#region Service
protected static float CountDownAhead => Service.Config.CountDownAhead;
protected float HealthAreaAbility => Jobs.FirstOrDefault().GetHealthAreaAbility();
protected float HealthAreaSpell => Jobs.FirstOrDefault().GetHealthAreaSpell();
protected float HealthAreaAbilityHot => Jobs.FirstOrDefault().GetHealthAreaAbilityHot();
protected float HealthAreaSpellHot => Jobs.FirstOrDefault().GetHealthAreaSpellHot();
protected float HealthSingleAbility => Jobs.FirstOrDefault().GetHealthSingleAbility();
protected float HealthSingleSpell => Jobs.FirstOrDefault().GetHealthSingleSpell();
protected float HealthSingleAbilityHot => Jobs.FirstOrDefault().GetHealthSingleAbilityHot();
protected float HealthSingleSpellHot => Jobs.FirstOrDefault().GetHealthSingleSpellHot();
protected float HealthForDyingTanksDefault => Jobs.FirstOrDefault().GetHealthForDyingTank();
#endregion
}
2 changes: 1 addition & 1 deletion RotationSolver.Basic/Service.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace RotationSolver.Basic;

public class Service
internal class Service
{
public const string Command = "/rotation";

Expand Down
2 changes: 1 addition & 1 deletion RotationSolver/ActionSequencer/TargetCondition.cs
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ public void Draw(ICustomRotation combo, bool isActionSequencer)
combos = new string[]
{
LocalizationManager.RightLang.ActionSequencer_Have,
LocalizationManager.RightLang.ActionSequencer_Havenot,
LocalizationManager.RightLang.ActionSequencer_HaveNot,
};
break;
case TargetConditionType.IsDying:
Expand Down
6 changes: 3 additions & 3 deletions RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@
"ConfigWindow_Param_UseAbility": "Auto-use abilities",
"ConfigWindow_Param_NoNewHostiles": "Don't attack new mobs by aoe",
"ConfigWindow_Params_NoNewHostilesDesc": "Never use any AOE action when this action may attack the mobs that not is a hostile target.",
"ConfigWindow_Param_UseDefenceAbility": "Use defense abilities",
"ConfigWindow_Param_UseDefenceAbilityDesc": "It is recommended to check this option if you are playing Raids./nPlan the heal and defense by yourself.???",
"ConfigWindow_Param_UseDefenseAbility": "Use defense abilities",
"ConfigWindow_Param_UseDefenseAbilityDesc": "It is recommended to check this option if you are playing Raids./nPlan the heal and defense by yourself.???",
"ConfigWindow_Param_AutoShield": "Auto tank stance",
"ConfigWindow_Param_AutoProvokeForTank": "Auto Provoke (Tank)",
"ConfigWindow_Param_AutoProvokeForTankDesc": "When a hostile is hitting the non-Tank member of party, it will automatically use the Provoke.",
Expand Down Expand Up @@ -237,7 +237,7 @@
"ActionSequencer_Is": "Is",
"ActionSequencer_Isnot": "Isnot",
"ActionSequencer_Have": "Have",
"ActionSequencer_Havenot": "Havenot",
"ActionSequencer_HaveNot": "Have not",
"ActionSequencer_TimeOffset": "Time Offset",
"ActionSequencer_Charges": "Charges",
"ActionSequencer_ConditionSet": "ConditionSet",
Expand Down
6 changes: 3 additions & 3 deletions RotationSolver/Localization/Strings.cs
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ internal partial class Strings
public string ConfigWindow_Param_UseAbility { get; set; } = "Auto-use abilities";
public string ConfigWindow_Param_NoNewHostiles { get; set; } = "Don't attack new mobs by aoe";
public string ConfigWindow_Params_NoNewHostilesDesc { get; set; } = "Never use any AOE action when this action may attack the mobs that not is a hostile target.";
public string ConfigWindow_Param_UseDefenceAbility { get; set; } = "Use defense abilities";
public string ConfigWindow_Param_UseDefenceAbilityDesc { get; set; } = "It is recommended to check this option if you are playing Raids./nPlan the heal and defense by yourself.???";
public string ConfigWindow_Param_UseDefenseAbility { get; set; } = "Use defense abilities";
public string ConfigWindow_Param_UseDefenseAbilityDesc { get; set; } = "It is recommended to check this option if you are playing Raids./nPlan the heal and defense by yourself.???";
public string ConfigWindow_Param_AutoShield { get; set; } = "Auto tank stance";
public string ConfigWindow_Param_AutoProvokeForTank { get; set; } = "Auto Provoke (Tank)";
public string ConfigWindow_Param_AutoProvokeForTankDesc { get; set; } = "When a hostile is hitting the non-Tank member of party, it will automatically use the Provoke.";
Expand Down Expand Up @@ -332,7 +332,7 @@ internal partial class Strings
public string ActionSequencer_Is { get; set; } = "Is";
public string ActionSequencer_Isnot { get; set; } = "Isnot";
public string ActionSequencer_Have { get; set; } = "Have";
public string ActionSequencer_Havenot { get; set; } = "Havenot";
public string ActionSequencer_HaveNot { get; set; } = "Have not";
public string ActionSequencer_TimeOffset { get; set; } = "Time Offset";
public string ActionSequencer_Charges { get; set; } = "Charges";
public string ActionSequencer_ConditionSet { get; set; } = "ConditionSet";
Expand Down
4 changes: 2 additions & 2 deletions RotationSolver/UI/RotationConfigWindow_Param.cs
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,9 @@ private void DrawParamAction()
{
ImGui.Indent();

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseDefenceAbility,
DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_UseDefenseAbility,
SettingsCommand.UseDefenseAbility,
LocalizationManager.RightLang.ConfigWindow_Param_UseDefenceAbilityDesc);
LocalizationManager.RightLang.ConfigWindow_Param_UseDefenseAbilityDesc);

DrawCheckBox(LocalizationManager.RightLang.ConfigWindow_Param_AutoShield,
SettingsCommand.AutoTankStance);
Expand Down
Binary file not shown.

0 comments on commit 152224a

Please sign in to comment.