diff --git a/RotationSolver.Basic/Actions/MedicineItem.cs b/RotationSolver.Basic/Actions/MedicineItem.cs index cdf1f7956..003a20f0a 100644 --- a/RotationSolver.Basic/Actions/MedicineItem.cs +++ b/RotationSolver.Basic/Actions/MedicineItem.cs @@ -55,5 +55,5 @@ public MedicineItem(Item item) : base(item) }; } - protected override bool CanUseThis => DataCenter.RightNowTinctureUseType == TinctureUseType.Anywhere || (DataCenter.RightNowTinctureUseType == TinctureUseType.InHighEndDuty && (DataCenter.Territory?.IsHighEndDuty ?? false)); + protected override bool CanUseThis => DataCenter.CurrentTinctureUseType == TinctureUseType.Anywhere || (DataCenter.CurrentTinctureUseType == TinctureUseType.InHighEndDuty && (DataCenter.Territory?.IsHighEndDuty ?? false)); } diff --git a/RotationSolver.Basic/Configuration/ConditionBoolean.cs b/RotationSolver.Basic/Configuration/ConditionBoolean.cs index 0264bebbe..75e12e9b6 100644 --- a/RotationSolver.Basic/Configuration/ConditionBoolean.cs +++ b/RotationSolver.Basic/Configuration/ConditionBoolean.cs @@ -55,7 +55,7 @@ public void ResetValue() public static implicit operator bool(ConditionBoolean condition) { if (!Service.Config.UseAdditionalConditions) return condition.Value; - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; var set = DataCenter.RightSet; if (rotation != null) { diff --git a/RotationSolver.Basic/Configuration/Configs.cs b/RotationSolver.Basic/Configuration/Configs.cs index ce9d4ab97..b3204cefa 100644 --- a/RotationSolver.Basic/Configuration/Configs.cs +++ b/RotationSolver.Basic/Configuration/Configs.cs @@ -11,7 +11,7 @@ internal partial class Configs : IPluginConfiguration [JsonIgnore] public const string BasicTimer = "BasicTimer", - BasicAutoSwitch = "BasicAutoSwitch", + BasicAutoSwitch = "BasicAutoSwitch", BasicParams = "BasicParams", UiInformation = "UiInformation", UiWindows = "UiWindows", @@ -53,7 +53,7 @@ public const string Filter = BasicAutoSwitch)] private static readonly bool _autoOffCutScene = true; - [ConditionBool, UI("Auto turn off when switching job", + [ConditionBool, UI("Auto turn off when switching jobs", Filter = BasicAutoSwitch)] private static readonly bool _autoOffSwitchClass = true; @@ -61,7 +61,7 @@ public const string Filter = BasicAutoSwitch)] private static readonly bool _autoOffWhenDead = true; - [ConditionBool, UI("Auto turn off when duty completed.", + [ConditionBool, UI("Auto turn off when duty is completed.", Filter = BasicAutoSwitch)] private static readonly bool _autoOffWhenDutyCompleted = true; @@ -70,7 +70,7 @@ public const string Filter = TargetConfig, Section = 2)] private static readonly bool _moveTowardsScreenCenter = false; - [ConditionBool, UI("Audio notification for when the status changes", + [ConditionBool, UI("Audio notification when status changes", Filter = UiInformation)] private static readonly bool _sayOutStateChanged = false; @@ -82,11 +82,11 @@ public const string Filter = UiInformation)] private static readonly bool _showInfoOnDtr = true; - [ConditionBool, UI("Display plugin status on toast popup", + [ConditionBool, UI("Display plugin status in toast popup", Filter = UiInformation)] private static readonly bool _showInfoOnToast = false; - [ConditionBool, UI("Lock the movement when casting or when doing some actions.", Filter = Extra)] + [ConditionBool, UI("Lock movement when casting or performing certain actions.", Filter = Extra)] private static readonly bool _poslockCasting = false; [UI("", Action = ActionID.PassageOfArmsPvE, Parent = nameof(PoslockCasting))] @@ -136,7 +136,7 @@ public const string Filter = TargetConfig)] private static readonly bool _jeunoTarget = true; - [ConditionBool, UI("Ignore immune targets in Cloud of Darkenss Chaotic.", + [ConditionBool, UI("Ignore immune targets in Cloud of Darkness Chaotic.", Filter = TargetConfig)] private static readonly bool _cODTarget = true; @@ -151,7 +151,7 @@ public const string Filter = UiInformation)] private static readonly bool _keyBoardNoise = true; - [ConditionBool, UI("Move to the furthest position for targeting are movement actions.", + [ConditionBool, UI("Move to the furthest position for targeting area movement actions.", Filter = TargetConfig, Section = 2)] private static readonly bool _moveAreaActionFarthest = false; @@ -163,7 +163,7 @@ public const string Parent = nameof(StartOnCountdown))] private static readonly bool _countdownStartsManualMode = false; - [ConditionBool, UI("Cancel auto mode if combat is started early during countdown", + [ConditionBool, UI("Cancel auto mode if combat starts early during countdown", Filter = BasicAutoSwitch, Section = 1)] private static readonly bool _cancelStateOnCombatBeforeCountdown = false; @@ -171,7 +171,7 @@ public const string Filter = BasicAutoSwitch, Section = 1)] private static readonly bool _startOnAttackedBySomeone = false; - [ConditionBool, UI("Don't attack new mobs by AoE. (Dangerous)", Description = "Never use any AoE action when this may attack the mobs that are not hostile targets.", + [ConditionBool, UI("Don't attack new mobs by AoE. (Dangerous)", Description = "Never use any AoE action when this may attack mobs that are not hostile targets.", Filter = BasicAutoSwitch)] private static readonly bool _noNewHostiles = false; @@ -180,7 +180,7 @@ public const string PvEFilter = JobFilterType.NoHealer, PvPFilter = JobFilterType.NoJob)] private static readonly bool _useHealWhenNotAHealer = true; - [ConditionBool, UI("Hard Target enemies for hostile actions", Description = "If this is disabled, RSR will only softtarget allies for heals, shields, etc.", + [ConditionBool, UI("Hard Target enemies for hostile actions", Description = "If this is disabled, RSR will only soft-target allies for heals, shields, etc.", Filter = TargetConfig, Section = 3)] private static readonly bool _switchTargetFriendly = false; @@ -202,11 +202,11 @@ public const string PvEFilter = JobFilterType.Dispel, PvPFilter = JobFilterType.NoJob)] private static readonly bool _dispelAll = false; - [ConditionBool, UI("Only attack the target in view.", + [ConditionBool, UI("Only attack targets in view.", Filter = TargetConfig, Section = 1)] private static readonly bool _onlyAttackInView = false; - [ConditionBool, UI("Only attack the targets in vision cone", + [ConditionBool, UI("Only attack targets in vision cone", Filter = TargetConfig, Section = 1)] private static readonly bool _onlyAttackInVisionCone = false; @@ -228,15 +228,15 @@ public const string Filter = Rotations)] private static readonly bool _autoReloadRotations = false; - [ConditionBool, UI("Make /rotation Manual as a toggle command.", + [ConditionBool, UI("Make /rotation Manual a toggle command.", Filter = BasicParams)] private static readonly bool _toggleManual = false; - [ConditionBool, UI("Make /rotation Auto as a toggle command. (Normal behavior cycles between targetting settings)", + [ConditionBool, UI("Make /rotation Auto a toggle command. (Normal behavior cycles between targeting settings)", Filter = BasicParams)] private static readonly bool _toggleAuto = false; - [ConditionBool, UI("Only show these windows if there are enemies in or in duty", + [ConditionBool, UI("Only show these windows if there are enemies or in duty", Filter = UiWindows)] private static readonly bool _onlyShowWithHostileOrInDuty = false; @@ -244,7 +244,7 @@ public const string Filter = UiWindows)] private static readonly bool _showControlWindow = false; - [ConditionBool, UI("Is Control Window Lock", + [ConditionBool, UI("Lock Control Window", Filter = UiWindows)] private static readonly bool _isControlWindowLock = false; @@ -276,7 +276,7 @@ public const string Filter = UiInformation)] private static readonly bool _showTooltips = true; - [ConditionBool, UI("Target Hunt/Relic/Leve priority. (Relic behaviour bugged)", + [ConditionBool, UI("Target Hunt/Relic/Leve priority. (Relic behavior bugged)", Filter = TargetConfig, Section = 1)] private static readonly bool _targetHuntingRelicLevePriority = true; @@ -284,7 +284,7 @@ public const string Filter = TargetConfig, Section = 1)] private static readonly bool _targetQuestPriority = true; - [ConditionBool, UI("Block targetting quest mobs belonging to other players (Broken).", + [ConditionBool, UI("Block targeting quest mobs belonging to other players (Broken).", Filter = TargetConfig, Section = 1)] private static readonly bool targetQuestThings = true; @@ -296,10 +296,10 @@ public const string Filter = UiInformation)] private static readonly bool _showToastsAboutDoAction = false; - [ConditionBool, UI("Allow rotations that use this config to use abilties definied in the rotation as burst", Filter = AutoActionUsage, Section = 4)] + [ConditionBool, UI("Allow rotations that use this config to use abilities defined in the rotation as burst", Filter = AutoActionUsage, Section = 4)] private static readonly bool _autoBurst = true; - [ConditionBool, UI("Disable hostile actions if something is casting an action on the Gaze/Stop list (EXPEREMENTAL)", Filter = AutoActionUsage, Section = 4)] + [ConditionBool, UI("Disable hostile actions if something is casting an action on the Gaze/Stop list (EXPERIMENTAL)", Filter = AutoActionUsage, Section = 4)] private static readonly bool _castingStop = false; [UI("Configurable amount of time before the cast finishes that RSR stops taking actions", Filter = AutoActionUsage, Section = 4, Parent = nameof(CastingStop))] @@ -327,7 +327,7 @@ public const string Parent = nameof(UseAbility), PvEFilter = JobFilterType.Tank)] private static readonly bool _autoProvokeForTank = true; - [ConditionBool, UI("Auto TrueNorth (Melee DPS)", + [ConditionBool, UI("Auto True North (Melee DPS)", Parent = nameof(UseAbility), PvEFilter = JobFilterType.Melee)] private static readonly bool _autoUseTrueNorth = true; @@ -351,11 +351,11 @@ public const string Filter = TargetConfig, Section = 1)] private static readonly bool _targetFatePriority = true; - [ConditionBool, UI("Auto turn off RSR when combat is over more for more then...", + [ConditionBool, UI("Auto turn off RSR when combat is over for more than:", Filter = BasicAutoSwitch)] private static readonly bool _autoOffAfterCombat = true; - [ConditionBool, UI("Auto Open the treasure chest", + [ConditionBool, UI("Auto Open treasure chests", Filter = Extra)] private static readonly bool _autoOpenChest = true; @@ -387,7 +387,7 @@ public const string public bool UseAdditionalConditions { get; set; } = false; #region Float - [UI("Auto turn off RSR when combat is over more for more then...", + [UI("Auto turn off RSR when combat is over for more than...", Parent = nameof(AutoOffAfterCombat))] [Range(0, 600, ConfigUnitType.Seconds)] public float AutoOffAfterCombatTime { get; set; } = 30; @@ -418,12 +418,12 @@ public const string [Range(0, 1, ConfigUnitType.Percent, 0.02f)] public float HealthHealerRatio { get; set; } = 0.4f; - [JobConfig, UI("Hard cast Raise players while Swiftcast is on cooldown", Description = "If this is enabled and Swiftcast is on cooldown, you will only attempt to raise while standing still.", + [JobConfig, UI("Hard cast Raise on players while Swiftcast is on cooldown", Description = "If this is enabled and Swiftcast is on cooldown, you will only attempt to raise while standing still.", Filter = HealingActionCondition, Section = 2, PvEFilter = JobFilterType.Raise, PvPFilter = JobFilterType.NoJob)] private static readonly bool _raisePlayerByCasting = true; - [JobConfig, UI("Raise player by using Swiftcast/Dualcast if avaliable", Description = "If this is disabled, you will never use Swiftcast/Dualcast to raise players.", + [JobConfig, UI("Raise player by using Swiftcast/Dualcast if available", Description = "If this is disabled, you will never use Swiftcast/Dualcast to raise players.", Filter = HealingActionCondition, Section = 2, PvEFilter = JobFilterType.Raise, PvPFilter = JobFilterType.NoJob)] private static readonly bool _raisePlayerBySwift = true; @@ -443,7 +443,7 @@ public const string PvEFilter = JobFilterType.Raise, PvPFilter = JobFilterType.NoJob)] private static readonly bool _raiseBrinkOfDeath = true; - [JobConfig, UI("Raise non-Healers from bottom of party list to the top (Light Party 2 Healer Behaviour, Experimental)", + [JobConfig, UI("Raise non-Healers from bottom of party list to the top (Light Party 2 Healer Behavior, Experimental)", Filter = HealingActionCondition, Section = 2, PvEFilter = JobFilterType.Raise, PvPFilter = JobFilterType.NoJob)] private static readonly bool _h2 = false; @@ -471,7 +471,7 @@ public const string PvEFilter = JobFilterType.Raise)] public int LessMPNoRaise { get; set; } - [UI("HP for standard deviation for using AoE heal.", Description = "Basically the health difference between a single party member and the whole party, used for deciding between healing a single party member or AOE healing. Leave this alone if you don't undertand its use.", + [UI("HP standard deviation for using AoE heal.", Description = "The health difference between a single party member and the whole party, used for deciding between healing a single party member or AOE healing. Leave this alone if you don't understand its use.", Filter = Extra)] [Range(0, 0.5f, ConfigUnitType.Percent, 0.02f)] public float HealthDifference { get; set; } = 0.25f; @@ -549,7 +549,7 @@ public const string public float CountDownAhead { get; set; } = 0.4f; [UI("The size of the sector angle that can be selected as the moveable target", - Description = "If the selection mode is based on character facing, i.e., targets within the character's viewpoint are moveable targets. \nIf the selection mode is screen-centered, i.e., targets within a sector drawn upward from the character's point are movable targets.", + Description = "If the selection mode is based on character facing, i.e., targets within the character's viewpoint are moveable targets.\nIf the selection mode is screen-centered, i.e., targets within a sector drawn upward from the character's point are movable targets.", Filter = TargetConfig, Section = 2)] [Range(0, 90, ConfigUnitType.Degree, 0.02f)] public float MoveTargetAngle { get; set; } = 24; @@ -559,12 +559,12 @@ public const string [Range(10, 1800, ConfigUnitType.Seconds, 0.02f)] public float BossTimeToKill { get; set; } = 90; - [UI("If target's TTK is lower than this, regard it is dying.", + [UI("If target's TTK is lower than this, regard it as dying.", Filter = TargetConfig, Section = 1)] [Range(0, 60, ConfigUnitType.Seconds, 0.02f)] public float DyingTimeToKill { get; set; } = 10; - [UI("If target's HP percentage is lower than this, regard it is dying.", + [UI("If target's HP percentage is lower than this, regard it as dying.", Filter = TargetConfig, Section = 1)] [Range(0, 0.1f, ConfigUnitType.Percent, 0.01f)] public float IsDyingConfig { get; set; } = 0.02f; @@ -589,16 +589,16 @@ public const string [Range(2, 30, ConfigUnitType.Yalms)] public float ControlProgressHeight { get; set; } = 8; - [UI("Use gapcloser as a damage ability if the distance to your target is less then this.", + [UI("Use gapcloser as a damage ability if the distance to your target is less than this.", Filter = TargetConfig, Section = 2)] [Range(0, 30, ConfigUnitType.Yalms, 1f)] public float DistanceForMoving { get; set; } = 1.2f; - [UI("Stop healing when time to kill is lower then...", Parent = nameof(UseHealWhenNotAHealer))] + [UI("Stop healing when time to kill is lower than:", Parent = nameof(UseHealWhenNotAHealer))] [Range(0, 30, ConfigUnitType.Seconds, 0.02f)] public float AutoHealTimeToKill { get; set; } = 8f; - [UI("The minimum time between updating RSR information. (Setting too low will negatively effect framerate, setting too high will lead to poor performance)", + [UI("The minimum time between updating RSR information. (Setting too low will negatively affect framerate, setting too high will lead to poor performance)", Filter = BasicTimer)] [JobConfig, Range(0, 0.3f, ConfigUnitType.Seconds, 0.002f)] public float MinUpdatingTime { get; set; } = 0.01f; @@ -629,7 +629,7 @@ public const string public int ActionSequencerIndex { get; set; } - [UI("The modifier key to unlock the movement temporary", Description = "RB is for gamepad player", Parent = nameof(PoslockCasting))] + [UI("The modifier key to unlock the movement temporarily", Description = "RB is for gamepad player", Parent = nameof(PoslockCasting))] public ConsoleModifiers PoslockModifier { get; set; } [Range(0, 5, ConfigUnitType.None, 1)] diff --git a/RotationSolver.Basic/DataCenter.cs b/RotationSolver.Basic/DataCenter.cs index b4f56af08..b4c66ef06 100644 --- a/RotationSolver.Basic/DataCenter.cs +++ b/RotationSolver.Basic/DataCenter.cs @@ -66,8 +66,8 @@ public static MajorConditionSet RightSet internal static Queue<(DateTime time, SortedList hpRatios)> RecordedHP { get; } = new(HP_RECORD_TIME + 1); - public static ICustomRotation? RightNowRotation { get; internal set; } - public static DutyRotation? RightNowDutyRotation { get; internal set; } + public static ICustomRotation? CurrentRotation { get; internal set; } + public static DutyRotation? CurrentDutyRotation { get; internal set; } public static Dictionary SystemWarnings { get; set; } = new(); @@ -192,8 +192,8 @@ internal static void AddCommandAction(IAction act, double time) NextActs.Sort((a, b) => a.DeadTime.CompareTo(b.DeadTime)); } - public static TargetHostileType RightNowTargetToHostileType => Service.Config.HostileType; - public static TinctureUseType RightNowTinctureUseType => Service.Config.TinctureType; + public static TargetHostileType CurrentTargetToHostileType => Service.Config.HostileType; + public static TinctureUseType CurrentTinctureUseType => Service.Config.TinctureType; public static unsafe ActionID LastComboAction => (ActionID)ActionManager.Instance()->Combo.Action; public static unsafe float ComboTime => ActionManager.Instance()->Combo.Timer; diff --git a/RotationSolver.Basic/Helpers/ObjectHelper.cs b/RotationSolver.Basic/Helpers/ObjectHelper.cs index 20d0e4283..ee037a7b1 100644 --- a/RotationSolver.Basic/Helpers/ObjectHelper.cs +++ b/RotationSolver.Basic/Helpers/ObjectHelper.cs @@ -134,7 +134,7 @@ internal static bool IsAttackable(this IBattleChara battleChara) if (battleChara.TargetObject == Player.Object || battleChara.TargetObject?.OwnerId == Player.Object.GameObjectId) return true; - return DataCenter.RightNowTargetToHostileType switch + return DataCenter.CurrentTargetToHostileType switch { TargetHostileType.AllTargetsCanAttack => true, TargetHostileType.TargetsHaveTarget => battleChara.TargetObject is IBattleChara, diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs index e8120d62b..967a833c4 100644 --- a/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs +++ b/RotationSolver.Basic/Rotations/CustomRotation_Ability.cs @@ -293,7 +293,7 @@ private bool MyInterruptAbility(JobRole role, IAction nextGCD, out IAction? act) /// True if the interrupt ability can be used; otherwise, false. protected virtual bool InterruptAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.InterruptAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.InterruptAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -337,7 +337,7 @@ private bool AntiKnockback(JobRole role, IAction nextGCD, out IAction? act) /// True if the anti-knockback ability can be used; otherwise, false. protected virtual bool AntiKnockbackAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.AntiKnockbackAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.AntiKnockbackAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -350,7 +350,7 @@ protected virtual bool AntiKnockbackAbility(IAction nextGCD, out IAction? act) /// True if the provoke ability can be used; otherwise, false. protected virtual bool ProvokeAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.ProvokeAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.ProvokeAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -424,7 +424,7 @@ protected virtual bool EmergencyAbility(IAction nextGCD, out IAction? act) } } - if (DataCenter.RightNowDutyRotation?.EmergencyAbility(nextGCD, out act) ?? false) + if (DataCenter.CurrentDutyRotation?.EmergencyAbility(nextGCD, out act) ?? false) { return true; } @@ -449,7 +449,7 @@ protected virtual bool EmergencyAbility(IAction nextGCD, out IAction? act) [RotationDesc(DescType.MoveForwardAbility)] protected virtual bool MoveForwardAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.MoveForwardAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.MoveForwardAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -463,7 +463,7 @@ protected virtual bool MoveForwardAbility(IAction nextGCD, out IAction? act) [RotationDesc(DescType.MoveBackAbility)] protected virtual bool MoveBackAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.MoveBackAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.MoveBackAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -478,7 +478,7 @@ protected virtual bool MoveBackAbility(IAction nextGCD, out IAction? act) protected virtual bool HealSingleAbility(IAction nextGCD, out IAction? act) { if (RecuperatePvP.CanUse(out act)) return true; - if (DataCenter.RightNowDutyRotation?.HealSingleAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.HealSingleAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -492,7 +492,7 @@ protected virtual bool HealSingleAbility(IAction nextGCD, out IAction? act) [RotationDesc(DescType.HealAreaAbility)] protected virtual bool HealAreaAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.HealAreaAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.HealAreaAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -506,7 +506,7 @@ protected virtual bool HealAreaAbility(IAction nextGCD, out IAction? act) [RotationDesc(DescType.DefenseSingleAbility)] protected virtual bool DefenseSingleAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.DefenseSingleAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.DefenseSingleAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -520,7 +520,7 @@ protected virtual bool DefenseSingleAbility(IAction nextGCD, out IAction? act) [RotationDesc(DescType.DefenseAreaAbility)] protected virtual bool DefenseAreaAbility(IAction nextGCD, out IAction? act) { - if (DataCenter.RightNowDutyRotation?.DefenseAreaAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.DefenseAreaAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -538,7 +538,7 @@ protected virtual bool SpeedAbility(IAction nextGCD, out IAction? act) if (PelotonPvE.CanUse(out act, skipAoeCheck: true)) return true; if (SprintPvE.CanUse(out act)) return true; - if (DataCenter.RightNowDutyRotation?.SpeedAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.SpeedAbility(nextGCD, out act) ?? false) return true; act = null; return false; } @@ -556,7 +556,7 @@ protected virtual bool GeneralAbility(IAction nextGCD, out IAction? act) act = null; } - if (DataCenter.RightNowDutyRotation?.GeneralAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.GeneralAbility(nextGCD, out act) ?? false) return true; act = null; return false; @@ -575,7 +575,7 @@ protected virtual bool AttackAbility(IAction nextGCD, out IAction? act) act = null; } - if (DataCenter.RightNowDutyRotation?.AttackAbility(nextGCD, out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.AttackAbility(nextGCD, out act) ?? false) return true; act = null; return false; } diff --git a/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs b/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs index 48fe62035..8e84f7e73 100644 --- a/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs +++ b/RotationSolver.Basic/Rotations/CustomRotation_GCD.cs @@ -212,7 +212,7 @@ protected virtual bool MyInterruptGCD(out IAction? act) act = null; if (ShouldSkipAction()) return false; - if (DataCenter.RightNowDutyRotation?.MyInterruptGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.MyInterruptGCD(out act) ?? false) return true; act = null; return false; } @@ -227,7 +227,7 @@ protected virtual bool RaiseGCD(out IAction? act) { IBaseAction.ShouldEndSpecial = true; } - if (DataCenter.RightNowDutyRotation?.RaiseGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.RaiseGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; act = null; return false; } @@ -246,7 +246,7 @@ protected virtual bool DispelGCD(out IAction? act) IBaseAction.ShouldEndSpecial = true; } if (!HasSwift && EsunaPvE.CanUse(out act)) return true; - if (DataCenter.RightNowDutyRotation?.DispelGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.DispelGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; return false; } @@ -267,7 +267,7 @@ protected virtual bool EmergencyGCD(out IAction? act) act = null; if (ShouldSkipAction()) return false; - if (DataCenter.RightNowDutyRotation?.EmergencyGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.EmergencyGCD(out act) ?? false) return true; act = null!; return false; } @@ -287,7 +287,7 @@ protected virtual bool MoveForwardGCD(out IAction? act) IBaseAction.ShouldEndSpecial = true; } - if (DataCenter.RightNowDutyRotation?.MoveForwardGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.MoveForwardGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; act = null; return false; } @@ -307,7 +307,7 @@ protected virtual bool HealSingleGCD(out IAction? act) IBaseAction.ShouldEndSpecial = true; } - if (DataCenter.RightNowDutyRotation?.HealSingleGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.HealSingleGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; act = null; return false; } @@ -327,7 +327,7 @@ protected virtual bool HealAreaGCD(out IAction? act) IBaseAction.ShouldEndSpecial = true; } - if (DataCenter.RightNowDutyRotation?.HealAreaGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.HealAreaGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; act = null!; return false; } @@ -347,7 +347,7 @@ protected virtual bool DefenseSingleGCD(out IAction? act) IBaseAction.ShouldEndSpecial = true; } - if (DataCenter.RightNowDutyRotation?.DefenseSingleGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.DefenseSingleGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; act = null!; return false; } @@ -367,7 +367,7 @@ protected virtual bool DefenseAreaGCD(out IAction? act) IBaseAction.ShouldEndSpecial = true; } - if (DataCenter.RightNowDutyRotation?.DefenseAreaGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.DefenseAreaGCD(out act) ?? false) return true; IBaseAction.ShouldEndSpecial = false; act = null; return false; } @@ -386,7 +386,7 @@ protected virtual bool GeneralGCD(out IAction? act) return false; } - if (DataCenter.RightNowDutyRotation?.GeneralGCD(out act) ?? false) return true; + if (DataCenter.CurrentDutyRotation?.GeneralGCD(out act) ?? false) return true; act = null; return false; } diff --git a/RotationSolver.Basic/Rotations/CustomRotation_Items.cs b/RotationSolver.Basic/Rotations/CustomRotation_Items.cs index 941af7d1d..87ec63441 100644 --- a/RotationSolver.Basic/Rotations/CustomRotation_Items.cs +++ b/RotationSolver.Basic/Rotations/CustomRotation_Items.cs @@ -35,12 +35,12 @@ protected bool UseBurstMedicine(out IAction? act, bool clippingCheck = true) bool isHostileTargetDummy = HostileTarget?.IsDummy() ?? false; bool isInHighEndDuty = DataCenter.Territory?.IsHighEndDuty ?? false; - if (!isHostileTargetDummy && !isInHighEndDuty && DataCenter.RightNowTinctureUseType == TinctureUseType.InHighEndDuty) + if (!isHostileTargetDummy && !isInHighEndDuty && DataCenter.CurrentTinctureUseType == TinctureUseType.InHighEndDuty) { return false; } - if (DataCenter.RightNowTinctureUseType == TinctureUseType.Nowhere) return false; + if (DataCenter.CurrentTinctureUseType == TinctureUseType.Nowhere) return false; foreach (var medicine in Medicines) { diff --git a/RotationSolver/Commands/RSCommands_Actions.cs b/RotationSolver/Commands/RSCommands_Actions.cs index 49e51fd38..a90fd04ac 100644 --- a/RotationSolver/Commands/RSCommands_Actions.cs +++ b/RotationSolver/Commands/RSCommands_Actions.cs @@ -195,7 +195,7 @@ internal static void UpdateRotationState() (Service.Config.AutoOffBetweenArea && (Svc.Condition[ConditionFlag.BetweenAreas] || Svc.Condition[ConditionFlag.BetweenAreas51])) || (Service.Config.CancelStateOnCombatBeforeCountdown && Service.CountDownTime > 0.2f && DataCenter.InCombat) || (ActionUpdater.AutoCancelTime != DateTime.MinValue && DateTime.Now > ActionUpdater.AutoCancelTime) || - (DataCenter.RightSet.SwitchCancelConditionSet?.IsTrue(DataCenter.RightNowRotation) ?? false)) + (DataCenter.RightSet.SwitchCancelConditionSet?.IsTrue(DataCenter.CurrentRotation) ?? false)) { CancelState(); #pragma warning disable CS0472 // The result of the expression is always the same since a value of this type is never equal to 'null' @@ -235,14 +235,14 @@ internal static void UpdateRotationState() _lastCountdownTime = 0; CancelState(); } - else if (DataCenter.RightSet.SwitchManualConditionSet?.IsTrue(DataCenter.RightNowRotation) ?? false) + else if (DataCenter.RightSet.SwitchManualConditionSet?.IsTrue(DataCenter.CurrentRotation) ?? false) { if (!DataCenter.State) { DoStateCommandType(StateCommandType.Manual); } } - else if (DataCenter.RightSet.SwitchAutoConditionSet?.IsTrue(DataCenter.RightNowRotation) ?? false) + else if (DataCenter.RightSet.SwitchAutoConditionSet?.IsTrue(DataCenter.CurrentRotation) ?? false) { if (!DataCenter.State) { diff --git a/RotationSolver/Commands/RSCommands_OtherCommand.cs b/RotationSolver/Commands/RSCommands_OtherCommand.cs index 45acb73d9..fae5aaff4 100644 --- a/RotationSolver/Commands/RSCommands_OtherCommand.cs +++ b/RotationSolver/Commands/RSCommands_OtherCommand.cs @@ -35,7 +35,7 @@ private static void DoOtherCommand(OtherCommandType otherType, string str) private static void ExecuteRotationCommand(string str) { - var customCombo = DataCenter.RightNowRotation; + var customCombo = DataCenter.CurrentRotation; if (customCombo == null) return; DoRotationCommand(customCombo, str); diff --git a/RotationSolver/Data/UiString.cs b/RotationSolver/Data/UiString.cs index 58e5d1de0..59970fd2a 100644 --- a/RotationSolver/Data/UiString.cs +++ b/RotationSolver/Data/UiString.cs @@ -4,7 +4,7 @@ namespace RotationSolver.Data { internal enum UiString { - [Description("The condition set you chose, click to modify.")] + [Description("The condition set you chose. Click to modify.")] ConfigWindow_ConditionSetDesc, [Description("Condition Set")] @@ -28,25 +28,25 @@ internal enum UiString [Description("Territory Condition")] ConfigWindow_Territoryset, - [Description("No rotations loaded! Please see the rotations tab!")] + [Description("No rotations loaded! Please check the rotations tab!")] ConfigWindow_NoRotation, - [Description("The duty rotation you chose, click to modify.")] + [Description("The duty rotation you chose. Click to modify.")] ConfigWindow_DutyRotationDesc, [Description("Remove")] ConfigWindow_List_Remove, - [Description("Load From folder.")] + [Description("Load from folder")] ActionSequencer_Load, - [Description("Analyses PvE combat information in every frame and finds the best action.")] + [Description("Analyzes PvE combat information in every frame and finds the best action.")] ConfigWindow_About_Punchline, [Description("Game")] ConfigWindow_Helper_GameVersion, - [Description("Invalid Rotation! \nPlease update to the latest version or contact to the {0}!")] + [Description("Invalid Rotation! \nPlease update to the latest version or contact {0}!")] ConfigWindow_Rotation_InvalidRotation, [Description("Beta Rotation!")] @@ -61,16 +61,16 @@ internal enum UiString [Description("Well, you must be a lazy player!")] ConfigWindow_About_Clicking100k, - [Description("You're tiring RSR out, give it a break!")] + [Description("You're tiring RSR out - give it a break!")] ConfigWindow_About_Clicking500k, - [Description("This means almost all the information available in one frame in combat, including the status of all players in the party, the status of any hostile targets, skill cooldowns, the MP and HP of characters, the location of characters, casting status of the hostile target, combo, combat duration, player level, etc.\n\nThen, it will highlight the best action on the hot bar, or help you to click on it.")] + [Description("This includes almost all information available in one combat frame, including the status of all party members, hostile target statuses, skill cooldowns, MP and HP of characters, character locations, hostile target casting status, combo state, combat duration, player level, etc.\n\nIt will then highlight the best action on the hotbar, or help you click it.")] ConfigWindow_About_Description, - [Description("It is designed for GENERAL COMBAT, not for savage or ultimate. Use it carefully.")] + [Description("This is designed for GENERAL COMBAT, not for Savage or Ultimate content. Use it carefully.")] ConfigWindow_About_Warning, - [Description("RSR helped you by clicking actions {0:N0} times.")] + [Description("RSR has helped you by clicking actions {0:N0} times.")] ConfigWindow_About_ClickingCount, [Description("Macro")] @@ -94,19 +94,19 @@ internal enum UiString [Description("Warning Time")] ConfigWindow_About_Warnings_Time, - [Description("Literally, Rotation Solver helps you to choose the target and then click the action. So any plugin that changes these will affect its decision.\n\nHere is a list of known incompatible plugins:")] + [Description("Rotation Solver helps you choose targets and click actions. Any plugin that changes these will affect its decisions.\n\nHere is a list of known incompatible plugins:")] ConfigWindow_About_Compatibility_Description, - [Description("Can't properly execute the behavior that RSR wants to do.")] + [Description("Cannot properly execute the behavior that RSR wants to perform.")] ConfigWindow_About_Compatibility_Mistake, - [Description("Conflicts with RSR decision making")] + [Description("Conflicts with RSR decision-making")] ConfigWindow_About_Compatibility_Mislead, - [Description("Causes the game to crash.")] + [Description("Causes the game to crash")] ConfigWindow_About_Compatibility_Crash, - [Description("Many thanks to the sponsors.")] + [Description("Many thanks to our sponsors.")] ConfigWindow_About_ThanksToSupporters, [Description("Open Config Folder")] @@ -124,43 +124,43 @@ internal enum UiString [Description("Status")] ConfigWindow_Rotation_Status, - [Description("Used to customize when RSR uses specific actions automatically, click on an action's icon in the left list. Below, you may set the conditions for when that specific action is used. Each action can have a different set of conditions to override the default rotation behavior.")] + [Description("Used to customize when RSR uses specific actions automatically. Click on an action's icon in the left list. Below, you may set the conditions for when that specific action is used. Each action can have different conditions to override the default rotation behavior.")] ConfigWindow_Actions_Description, [Description("Show on CD window")] ConfigWindow_Actions_ShowOnCDWindow, - [Description("TTK that this action needs the target be before it is used.")] + [Description("Time-to-kill threshold required for this action to be used")] ConfigWindow_Actions_TTK, - [Description("How many targets are needed to use this action.")] + [Description("Number of targets needed to use this action")] ConfigWindow_Actions_AoeCount, - [Description("Should this action check the status.")] + [Description("Should this action check status effects")] ConfigWindow_Actions_CheckStatus, - [Description("How many gcds before the dot is reapplied.")] + [Description("Number of GCDs before the DoT is reapplied")] ConfigWindow_Actions_GcdCount, - [Description("The HP ratio to auto heal")] + [Description("HP ratio for automatic healing")] ConfigWindow_Actions_HealRatio, - [Description("Forced Conditions have a higher priority. If Forced Conditions are met, Disabled Condition will be ignored.")] + [Description("Forced Conditions have higher priority. If Forced Conditions are met, Disabled Conditions will be ignored.")] ConfigWindow_Actions_ConditionDescription, [Description("Forced Condition")] ConfigWindow_Actions_ForcedConditionSet, - [Description("Conditions for forced automatic use of action.")] + [Description("Conditions for forced automatic use of action")] ConfigWindow_Actions_ForcedConditionSet_Description, [Description("Disabled Condition")] ConfigWindow_Actions_DisabledConditionSet, - [Description("Conditions for automatic use of action being disabled.")] + [Description("Conditions that disable automatic use of an action")] ConfigWindow_Actions_DisabledConditionSet_Description, - [Description("Custom rotations are just like plugins and have full access to the game and your computer")] + [Description("Custom rotations are like plugins and have full access to the game and your computer")] ConfigWindow_Rotations_Warning, [Description("Please only load rotations from sources that you trust")] @@ -169,13 +169,13 @@ internal enum UiString [Description("Update Rotations")] ConfigWindow_Rotations_Download, - [Description("Reset To Defaults")] + [Description("Reset to Defaults")] ConfigWindow_Rotations_Reset, [Description("Rotation Sources:")] ConfigWindow_Rotations_Sources, - [Description("Links of the rotations online")] + [Description("Links to online rotations")] ConfigWindow_Rotations_Links, [Description("Settings")] @@ -184,13 +184,13 @@ internal enum UiString [Description("Loaded")] ConfigWindow_Rotations_Loaded, - [Description("Github")] + [Description("GitHub")] ConfigWindow_Rotations_GitHub, [Description("Libraries")] ConfigWindow_Rotations_Libraries, - [Description("User Name")] + [Description("Username")] ConfigWindow_Rotations_UserName, [Description("Repository")] @@ -199,10 +199,10 @@ internal enum UiString [Description("File Name")] ConfigWindow_Rotations_FileName, - [Description("The folder contains the rotation library or the download url for the rotation library.")] + [Description("The folder containing the rotation library or the download URL for the rotation library")] ConfigWindow_Rotations_Library, - [Description("In this window, you can set the parameters that can be customised using lists.")] + [Description("In this window, you can set parameters that can be customized using lists.")] ConfigWindow_List_Description, [Description("Statuses")] @@ -211,10 +211,10 @@ internal enum UiString [Description("Actions")] ConfigWindow_List_Actions, - [Description("Map specific settings")] + [Description("Map-specific settings")] ConfigWindow_List_Territories, - [Description("Status name or id")] + [Description("Status name or ID")] ConfigWindow_List_StatusNameOrId, [Description("Invulnerability")] @@ -226,7 +226,7 @@ internal enum UiString [Description("Dispellable debuffs")] ConfigWindow_List_DangerousStatus, - [Description("No Casting debuffs")] + [Description("No-casting debuffs")] ConfigWindow_List_NoCastingStatus, [Description("Ignores target if it has one of these statuses")] @@ -238,7 +238,7 @@ internal enum UiString [Description("Dispellable debuffs list")] ConfigWindow_List_DangerousStatusDesc, - [Description("Do no action if you have one of these debuffs")] + [Description("Do not take action if you have one of these debuffs")] ConfigWindow_List_NoCastingStatusDesc, [Description("Copy to Clipboard")] @@ -250,7 +250,7 @@ internal enum UiString [Description("Add Status")] ConfigWindow_List_AddStatus, - [Description("Action name or id")] + [Description("Action name or ID")] ConfigWindow_List_ActionNameOrId, [Description("Tank Buster")] @@ -289,22 +289,22 @@ internal enum UiString [Description("Beneficial AoE locations")] ConfigWindow_List_BeneficialPositions, - [Description("Enemies that will be prioritized. This system is under construction and experimental, but should be stable.")] + [Description("Enemies that will be prioritized. This system is under construction and experimental but should be stable.")] ConfigWindow_List_PrioTargetDesc, - [Description("Enemies that will never be targeted.")] + [Description("Enemies that will never be targeted")] ConfigWindow_List_NoHostileDesc, - [Description("The name of the enemy that you want to be prioritized.")] + [Description("The name of the enemy that you want to prioritize")] ConfigWindow_List_PrioTargetName, - [Description("The name of the enemy that you don't want to be targeted")] + [Description("The name of the enemy that you don't want to target")] ConfigWindow_List_NoHostilesName, - [Description("Enemies that will never be provoked.")] + [Description("Enemies that will never be provoked")] ConfigWindow_List_NoProvokeDesc, - [Description("The name of the enemy that you don't want to be provoked")] + [Description("The name of the enemy that you don't want to provoke")] ConfigWindow_List_NoProvokeName, [Description("Add beneficial AoE location")] @@ -325,16 +325,16 @@ internal enum UiString [Description("Targets with Heal-over-Time")] HotTargets, - [Description("HP for AoE healing oGCDs")] + [Description("HP threshold for AoE healing oGCDs")] HpAoe0Gcd, - [Description("HP for AoE healing GCDs")] + [Description("HP threshold for AoE healing GCDs")] HpAoeGcd, - [Description("HP for ST healing oGCDs")] + [Description("HP threshold for single-target healing oGCDs")] HpSingle0Gcd, - [Description("HP for ST healing GCDs")] + [Description("HP threshold for single-target healing GCDs")] HpSingleGcd, [Description("No Move")] @@ -343,7 +343,7 @@ internal enum UiString [Description("Move")] InfoWindowMove, - [Description("Search... ")] + [Description("Search...")] ConfigWindow_Searching, [Description("Timer")] @@ -358,28 +358,28 @@ internal enum UiString [Description("Others")] ConfigWindow_Basic_Others, - [Description("The ping time.\nIn RSR, it means the time from sending the action request to receiving the using success message from the server.")] + [Description("The ping time.\nIn RSR, this means the time from sending the action request to receiving the success message from the server.")] ConfigWindow_Basic_Ping, - [Description("The Animation lock time from individual actions. Here is 0.6s for example.")] + [Description("The animation lock time for individual actions. For example, 0.6s.")] ConfigWindow_Basic_AnimationLockTime, - [Description("The clicking duration, RSR will try to click at this moment.")] + [Description("The clicking duration - RSR will try to click at this moment.")] ConfigWindow_Basic_ClickingDuration, - [Description("The ideal click time.")] + [Description("The ideal click time")] ConfigWindow_Basic_IdealClickingTime, - [Description("The real click time.")] + [Description("The actual click time")] ConfigWindow_Basic_RealClickingTime, - [Description("Auto turn off conditions")] + [Description("Auto turn-off conditions")] ConfigWindow_Basic_SwitchCancelConditionSet, - [Description("Auto turn manual conditions")] + [Description("Auto manual mode conditions")] ConfigWindow_Basic_SwitchManualConditionSet, - [Description("Auto turn auto conditions")] + [Description("Auto automatic mode conditions")] ConfigWindow_Basic_SwitchAutoConditionSet, [Description("Condition Name")] @@ -394,13 +394,13 @@ internal enum UiString [Description("Windows")] ConfigWindow_UI_Windows, - [Description("Change the way that RSR automatically uses actions.")] + [Description("Change how RSR automatically uses actions")] ConfigWindow_Auto_Description, [Description("Action Usage and Control")] ConfigWindow_Auto_ActionUsage, - [Description("Which actions RSR can use.")] + [Description("Which actions RSR can use")] ConfigWindow_Auto_ActionUsage_Description, [Description("Healing Usage and Control")] @@ -424,10 +424,10 @@ internal enum UiString [Description("Defense Single Forced Condition")] ConfigWindow_Auto_DefenseSingleConditionSet, - [Description("Dispel Stance Positional Forced Condition")] + [Description("Dispel/Stance/Positional Forced Condition")] ConfigWindow_Auto_DispelStancePositionalConditionSet, - [Description("Raise Shirk Forced Condition")] + [Description("Raise/Shirk Forced Condition")] ConfigWindow_Auto_RaiseShirkConditionSet, [Description("Move Forward Forced Condition")] @@ -436,7 +436,7 @@ internal enum UiString [Description("Move Back Forced Condition")] ConfigWindow_Auto_MoveBackConditionSet, - [Description("Anti Knockback Forced Condition")] + [Description("Anti-Knockback Forced Condition")] ConfigWindow_Auto_AntiKnockbackConditionSet, [Description("Speed Forced Condition")] @@ -445,7 +445,7 @@ internal enum UiString [Description("No Casting Condition Set")] ConfigWindow_Auto_NoCastingConditionSet, - [Description("This will change the way that RSR uses actions.")] + [Description("This will change how RSR uses actions")] ConfigWindow_Auto_ActionCondition_Description, [Description("Configuration")] @@ -469,7 +469,7 @@ internal enum UiString [Description("Hostile target selection condition")] ConfigWindow_Param_HostileCondition, - [Description("RSR focuses on the rotation itself. These are side features. If there are some other plugins can do that, these features will be deleted.")] + [Description("RSR focuses on the rotation itself. These are side features. Subject to removal at any time.")] ConfigWindow_Extra_Description, [Description("Event")] @@ -481,7 +481,7 @@ internal enum UiString [Description("Add Events")] ConfigWindow_Events_AddEvent, - [Description("In this window, you can set what macro will be trigger after using an action.")] + [Description("In this window, you can set which macro will be triggered after using an action.")] ConfigWindow_Events_Description, [Description("Duty Start: ")] @@ -493,22 +493,22 @@ internal enum UiString [Description("Delete Event")] ConfigWindow_Events_RemoveEvent, - [Description("Click to make it reverse.\nIs reversed : {0}")] + [Description("Click to make it reverse.\nIs reversed: {0}")] ActionSequencer_NotDescription, [Description("Member Name")] ConfigWindow_Actions_MemberName, - [Description("Rotation is null, please login or switch the job!")] + [Description("Rotation is null. Please log in or switch jobs!")] ConfigWindow_Condition_RotationNullWarning, - [Description("Delay its turning to true.")] + [Description("Delay its transition to true")] ActionSequencer_Delay_Description, - [Description("Delay its turning.")] + [Description("Delay its transition")] ActionSequencer_Offset_Description, - [Description("Enough Level")] + [Description("Sufficient Level")] ActionConditionType_EnoughLevel, [Description("Time Offset")] @@ -532,7 +532,7 @@ internal enum UiString [Description("From Self")] ActionSequencer_StatusSelf, - [Description("You'd better not use it. Because this target isn't the action's target. Try to pick it from action.")] + [Description("You should not use this, as this target isn't the action's target. Try selecting it from the action instead.")] ConfigWindow_Condition_TargetWarning, [Description("Territory Name")] @@ -541,25 +541,25 @@ internal enum UiString [Description("Duty Name")] ConfigWindow_Condition_DutyName, - [Description("Please separately keybind damage reduction / shield cooldowns in case RSR fails at a crucial moment in {0}!")] + [Description("Please separately bind damage reduction/shield cooldowns in case RSR fails at a crucial moment in {0}!")] HighEndWarning, - [Description("Avarice addon was not detected, please install it if you want to get the positional indicators for RSRs overlay!")] + [Description("Avarice addon was not detected. Please install it if you want positional indicators for RSR's overlay!")] AvariceWarning, - [Description("TextToTalk addon was not detected, please install it to make RSR give audio notifications!")] + [Description("TextToTalk addon was not detected. Please install it to enable RSR's audio notifications!")] TextToTalkWarning, [Description("Use Forced Enable Condition")] ForcedEnableCondition, - [Description("The conditions of forced to make it true.")] + [Description("The conditions that force this to be true")] ForcedEnableConditionDesc, [Description("Use Forced Disable Condition")] ForcedDisableCondition, - [Description("The conditions of forced to make it false.")] + [Description("The conditions that force this to be false")] ForcedDisableConditionDesc, [Description("Click to execute the command")] @@ -580,19 +580,19 @@ internal enum UiString [Description("Modify {0} to {1}")] CommandsChangeSettingsValue, - [Description("Failed to find the config in this rotation, please check it.")] + [Description("Failed to find the config in this rotation. Please check it.")] CommandsCannotFindConfig, [Description("Will use it within {0}s")] CommandsInsertAction, - [Description("Can not find the action, please check the action name.")] + [Description("Cannot find the action. Please check the action name.")] CommandsInsertActionFailure, - [Description("Failed to get both value and config from string. Please make sure you provide both a config option and value")] + [Description("Failed to get both value and config from string. Please make sure you provide both a config option and value.")] CommandsMissingArgument, - [Description("Start ")] + [Description("Start")] SpecialCommandType_Start, [Description("Cancel")] @@ -631,7 +631,7 @@ internal enum UiString [Description("Move Back")] SpecialCommandType_MoveBack, - [Description("Anti Knockback")] + [Description("Anti-Knockback")] SpecialCommandType_AntiKnockback, [Description("Burst")] @@ -649,7 +649,7 @@ internal enum UiString [Description("No Casting")] SpecialCommandType_NoCasting, - [Description("Auto Target ")] + [Description("Auto Target")] SpecialCommandType_Smart, [Description("Manual Target")] @@ -658,22 +658,22 @@ internal enum UiString [Description("Off")] SpecialCommandType_Off, - [Description("Open config window.")] + [Description("Open config window")] Commands_Rotation, [Description("Rotation Solver Reborn Settings v")] ConfigWindowHeader, - [Description("This config is job specific")] + [Description("This config is job-specific")] JobConfigTip, - [Description("This option is unavailable while using your current job\n \nRoles or jobs needed:\n{0}")] + [Description("This option is unavailable with your current job\n \nRoles or jobs needed:\n{0}")] NotInJob, [Description("Welcome to Rotation Solver Reborn!")] WelcomeWindow_Header, - [Description("Here's what you missed since the last time you were here")] + [Description("Here's what you missed since you were last here")] WelcomeWindow_WelcomeBack, [Description("It looks like you might be new here! Let's get you started!")] @@ -685,7 +685,7 @@ internal enum UiString [Description("Reorder AutoStatus Priorities")] ConfigWindow_Auto_PrioritiesOrganizer, - [Description("PvP Specific Controls")] + [Description("PvP-Specific Controls")] ConfigWindow_Auto_PvPSpecific, } diff --git a/RotationSolver/RotationSolverPlugin.cs b/RotationSolver/RotationSolverPlugin.cs index 728b37dd2..38d1cba20 100644 --- a/RotationSolver/RotationSolverPlugin.cs +++ b/RotationSolver/RotationSolverPlugin.cs @@ -144,7 +144,7 @@ static void ClientState_TerritoryChanged(ushort id) try { - DataCenter.RightNowRotation?.OnTerritoryChanged(); + DataCenter.CurrentRotation?.OnTerritoryChanged(); } catch (Exception ex) { @@ -222,7 +222,7 @@ internal static void OpenConfigWindow() internal static void UpdateDisplayWindow() { var isValid = validDelay.Delay(MajorUpdater.IsValid - && DataCenter.RightNowRotation != null + && DataCenter.CurrentRotation != null && !Svc.Condition[ConditionFlag.OccupiedInCutSceneEvent] && !Svc.Condition[ConditionFlag.Occupied38] //Treasure hunt. && !Svc.Condition[ConditionFlag.WaitingForDuty] diff --git a/RotationSolver/UI/ControlWindow.cs b/RotationSolver/UI/ControlWindow.cs index 707d4c6ef..a2bd2223b 100644 --- a/RotationSolver/UI/ControlWindow.cs +++ b/RotationSolver/UI/ControlWindow.cs @@ -105,7 +105,7 @@ public override unsafe void Draw() private static void DrawSpecials() { - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; DrawCommandAction(rotation?.ActionHealAreaGCD, rotation?.ActionHealAreaAbility, SpecialCommandType.HealArea, ImGuiColors.HealerGreen); @@ -181,7 +181,7 @@ private static void DrawSpecials() { if (group) { - ImGui.Text(DataCenter.RightNowTargetToHostileType.GetDescription()); + ImGui.Text(DataCenter.CurrentTargetToHostileType.GetDescription()); ImGui.Text("Auto: " + DataCenter.AutoStatus.ToString()); } } diff --git a/RotationSolver/UI/CooldownWindow.cs b/RotationSolver/UI/CooldownWindow.cs index 845135495..8344702e6 100644 --- a/RotationSolver/UI/CooldownWindow.cs +++ b/RotationSolver/UI/CooldownWindow.cs @@ -6,7 +6,7 @@ internal class CooldownWindow() : CtrlWindow(nameof(CooldownWindow)) { public override void Draw() { - if (DataCenter.RightNowRotation == null) return; + if (DataCenter.CurrentRotation == null) return; var config = Service.Config; var width = config.CooldownWindowIconSize; diff --git a/RotationSolver/UI/RotationConfigWindow.cs b/RotationSolver/UI/RotationConfigWindow.cs index 8528a7af9..e61748238 100644 --- a/RotationSolver/UI/RotationConfigWindow.cs +++ b/RotationSolver/UI/RotationConfigWindow.cs @@ -1,5 +1,4 @@ using Dalamud.Game.ClientState.Keys; -using Dalamud.Game.ClientState.Objects.SubKinds; using Dalamud.Interface.Colors; using Dalamud.Interface.Utility; using Dalamud.Interface.Utility.Raii; @@ -105,7 +104,7 @@ public override void Draw() private static void DrawDutyRotation() { - var dutyRotation = DataCenter.RightNowDutyRotation; + var dutyRotation = DataCenter.CurrentDutyRotation; if (dutyRotation == null) return; var rot = dutyRotation.GetType().GetCustomAttribute(); @@ -147,45 +146,13 @@ private void DrawErrorZone() { var incompatiblePlugins = DownloadHelper.IncompatiblePlugins ?? Array.Empty(); - bool hasIncompatiblePlugin = false; - foreach (var item in incompatiblePlugins) - { - if ((item.Name == "XIV Combo" || item.Name == "XIV Combo Expanded" || item.Name == "XIVSlothCombo" || item.Name == "Wrath Combo") && item.IsInstalled) - { - hasIncompatiblePlugin = true; - break; - } - } + bool hasIncompatiblePlugin = incompatiblePlugins.Any(p => p.IsInstalled); if (hasIncompatiblePlugin) { string message = "Disable incompatible plugin"; - foreach (var plugin in incompatiblePlugins) - { - if (plugin.IsInstalled) - { - if (plugin.Name == "XIV Combo") - { - message = "Disable XIV Combo plugin, causes targetting issues"; - break; - } - else if (plugin.Name == "XIV Combo Expanded") - { - message = "Disable XIV Combo Expanded plugin, causes targetting issues"; - break; - } - else if (plugin.Name == "XIVSlothCombo") - { - message = "Disable XIVSlothCombo plugin, causes targetting issues"; - break; - } - else if (plugin.Name == "Wrath Combo") - { - message = "Disable Wrath Combo plugin, causes targetting issues"; - break; - } - } - } + var installedPlugin = incompatiblePlugins.FirstOrDefault(p => p.IsInstalled); + message = $"Disable {installedPlugin.Name}, causes targetting issues."; float availableWidth = ImGui.GetContentRegionAvail().X; // Get the available width dynamically using (var color = ImRaii.PushColor(ImGuiCol.Text, ImGui.ColorConvertFloat4ToU32(ImGuiColors.DalamudOrange))) @@ -229,16 +196,14 @@ private void DrawErrorZone() } } - IPlayerCharacter localPlayer = Player.Object; - - if (localPlayer != null && (Player.Job == Job.CRP || Player.Job == Job.BSM || Player.Job == Job.ARM || Player.Job == Job.GSM || + if (Player.Object != null && (Player.Job == Job.CRP || Player.Job == Job.BSM || Player.Job == Job.ARM || Player.Job == Job.GSM || Player.Job == Job.LTW || Player.Job == Job.WVR || Player.Job == Job.ALC || Player.Job == Job.CUL || Player.Job == Job.MIN || Player.Job == Job.FSH || Player.Job == Job.BTN)) { float availableWidth = ImGui.GetContentRegionAvail().X; // Get the available width dynamically ImGui.PushTextWrapPos(ImGui.GetCursorPos().X + availableWidth); // Set text wrapping position dynamically ImGui.PushStyleColor(ImGuiCol.Text, ImGuiColors.DalamudOrange); // Set text color to DalamudOrange - ImGui.Text("You are on an unsupported class (Crafter/Gatherer)"); + ImGui.Text($"You are on an unsupported class: {Player.Job}"); ImGui.PopStyleColor(); // Reset text color ImGui.PopTextWrapPos(); // Reset text wrapping position } @@ -382,7 +347,7 @@ private void DrawHeader(float wholeWidth) { if (_showText) // Conditionally render the text { - ImGui.TextWrapped("Click RSR icon for main menu"); + ImGui.TextWrapped("Click RSR icon for main menu."); ImGui.Spacing(); } @@ -414,7 +379,7 @@ private void DrawHeader(float wholeWidth) ImGui.Spacing(); } - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; if (rotation == null && !(Player.Job == Job.CRP || Player.Job == Job.BSM || Player.Job == Job.ARM || Player.Job == Job.GSM || Player.Job == Job.LTW || Player.Job == Job.WVR || Player.Job == Job.ALC || Player.Job == Job.CUL || @@ -1055,7 +1020,7 @@ private static void DrawAboutLinks() private void DrawAutoduty() { - ImGui.TextWrapped("This is a gentle reminder that RSR is not a botting tool, and while I have taken steps to help it work better with Autoduty please keep that in mind"); + ImGui.TextWrapped("While the RSR Team has made effort to make RSRcompatible with Autoduty, please keep in mind that RSR is not a botting tool."); ImGui.Spacing(); ImGui.TextWrapped("This menu is mostly for troubleshooting purposes and is a good first step to share to get assistance."); ImGui.Spacing(); @@ -1064,7 +1029,7 @@ private void DrawAutoduty() ImGui.Separator(); ImGui.Spacing(); // Display the current HostileType - ImGui.TextWrapped($"Current Targeting Mode: {GetHostileTypeDescription(DataCenter.RightNowTargetToHostileType)}"); + ImGui.TextWrapped($"Current Targeting Mode: {GetHostileTypeDescription(DataCenter.CurrentTargetToHostileType)}"); // Add a button to change the targeting to AllTargetsCanAttack (type 0) aka Autoduty Mode if (ImGui.Button("Change Targeting to Autoduty Mode")) @@ -1207,7 +1172,7 @@ private void SetTargetingType(TargetHostileType type) #region Rotation private static void DrawRotation() { - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; if (rotation == null) return; var desc = rotation.Description; @@ -1264,7 +1229,7 @@ private static uint ChangeAlpha(uint color) private const float DESC_SIZE = 24; private static void DrawRotationDescription() { - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; if (rotation == null) return; var wholeWidth = ImGui.GetWindowWidth(); @@ -1377,7 +1342,7 @@ internal static void DrawLinkDescription(LinkDescription link, float wholeWidth, private static string GetRotationStatusHead() { - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; var status = UiString.ConfigWindow_Rotation_Status.GetDescription(); if (Service.Config.InDebug) { @@ -1389,7 +1354,7 @@ private static string GetRotationStatusHead() private static void DrawRotationStatus() { - DataCenter.RightNowRotation?.DisplayStatus(); + DataCenter.CurrentRotation?.DisplayStatus(); } private static string ToCommandStr(OtherCommandType type, string str, string extra = "") @@ -1400,7 +1365,7 @@ private static string ToCommandStr(OtherCommandType type, string str, string ext } private static void DrawRotationConfiguration() { - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; if (rotation == null) return; var enable = rotation.IsEnabled; @@ -1515,7 +1480,7 @@ private static void DrawRotationConfiguration() private static void DrawRotationInformation() { - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; if (rotation == null) return; var youtubeLink = rotation.GetType().GetCustomAttribute()?.ID; @@ -1593,7 +1558,7 @@ private static unsafe void DrawActions() { _actionsList.ClearCollapsingHeader(); - if (DataCenter.RightNowRotation != null && RotationUpdater.AllGroupedActions != null) + if (DataCenter.CurrentRotation != null && RotationUpdater.AllGroupedActions != null) { var size = 30 * Scale; var count = Math.Max(1, (int)MathF.Floor(ImGui.GetColumnWidth() / (size * 1.1f + ImGui.GetStyle().ItemSpacing.X))); @@ -1822,7 +1787,7 @@ static void DrawActionDebug() { ImGui.TextWrapped(UiString.ConfigWindow_Actions_ForcedConditionSet_Description.GetDescription()); - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; var set = DataCenter.RightSet; if (set == null || _activeAction == null || rotation == null) return; @@ -1833,7 +1798,7 @@ static void DrawActionDebug() { ImGui.TextWrapped(UiString.ConfigWindow_Actions_DisabledConditionSet_Description.GetDescription()); - var rotation = DataCenter.RightNowRotation; + var rotation = DataCenter.CurrentRotation; var set = DataCenter.RightSet; if (set == null || _activeAction == null || rotation == null) return; @@ -2707,7 +2672,7 @@ private static void DrawDebug() private static readonly CollapsingHeaderGroup _debugHeader = new(new() { - {() => DataCenter.RightNowRotation != null ? "Rotation" : string.Empty, DrawDebugRotationStatus}, + {() => DataCenter.CurrentRotation != null ? "Rotation" : string.Empty, DrawDebugRotationStatus}, {() => "Player Status", DrawStatus }, {() => "Party", DrawParty }, {() => "Target Data", DrawTargetData }, @@ -2725,7 +2690,7 @@ private static void DrawDebug() private static void DrawDebugRotationStatus() { - DataCenter.RightNowRotation?.DisplayStatus(); + DataCenter.CurrentRotation?.DisplayStatus(); } private static unsafe void DrawStatus() @@ -2840,7 +2805,7 @@ private static unsafe void DrawStatus() ImGui.Text($"TerritoryType: {DataCenter.Territory?.ContentType}"); ImGui.Text($"DPSTaken: {DataCenter.DPSTaken}"); ImGui.Text($"IsHostileCastingToTank: {DataCenter.IsHostileCastingToTank}"); - ImGui.Text($"RightNowRotation: {DataCenter.RightNowRotation}"); + ImGui.Text($"CurrentRotation: {DataCenter.CurrentRotation}"); ImGui.Text($"Job: {DataCenter.Job}"); ImGui.Text($"JobRange: {DataCenter.JobRange}"); ImGui.Text($"Job Role: {DataCenter.Role}"); @@ -2927,19 +2892,6 @@ private static unsafe void DrawTargetData() ImGui.Text($"Is Others Players: {battleChara.IsOthersPlayers()}"); ImGui.Text($"Targetable: {battleChara.Struct()->Character.GameObject.TargetableStatus}"); - var npc = battleChara.GetObjectNPC(); - if (npc != null) - { - // ImGui.Text($"Unknown12: {npc.Unknown12}"); commented out for now as broken with Lumina5 and unsure its purposed tbh - - // Uncomment these lines if needed - // ImGui.Text($"Unknown15: {npc.Unknown15}"); - // ImGui.Text($"Unknown18: {npc.Unknown18}"); - // ImGui.Text($"Unknown19: {npc.Unknown19}"); - // ImGui.Text($"Unknown20: {npc.Unknown20}"); - // ImGui.Text($"Unknown21: {npc.Unknown21}"); - } - foreach (var status in battleChara.StatusList) { var source = status.SourceId == Player.Object.GameObjectId ? "You" : Svc.Objects.SearchById(status.SourceId) == null ? "None" : "Others"; @@ -2957,7 +2909,7 @@ private static unsafe void DrawTargetData() private static void DrawNextAction() { - ImGui.Text(DataCenter.RightNowRotation?.GetType().GetCustomAttribute()!.Name); + ImGui.Text(DataCenter.CurrentRotation?.GetType().GetCustomAttribute()!.Name); ImGui.Text(DataCenter.SpecialType.ToString()); ImGui.Text(ActionUpdater.NextAction?.Name ?? "null"); diff --git a/RotationSolver/UI/RotationConfigWindowTab.cs b/RotationSolver/UI/RotationConfigWindowTab.cs index d553544fa..12ed2ff72 100644 --- a/RotationSolver/UI/RotationConfigWindowTab.cs +++ b/RotationSolver/UI/RotationConfigWindowTab.cs @@ -28,34 +28,34 @@ internal enum RotationConfigWindowTab : byte [TabSkip] About, [TabSkip] Rotation, - [Description("The abilities and custom conditions for your current Job.")] + [Description("Configure abilities and custom conditions for your current job.")] [TabIcon(Icon = 4)] Actions, - [Description("All rotations that RSR has loaded")] + [Description("View and manage all loaded RSR rotations.")] [TabIcon(Icon = 47)] Rotations, - [Description("Reactive action and statuses lists")] + [Description("Configure reactive actions and status effect lists.")] [TabIcon(Icon = 21)] List, - [Description("Basic settings")] + [Description("Configure basic settings.")] [TabIcon(Icon = 14)] Basic, - [Description("User interface settings")] + [Description("Configure user interface settings.")] [TabIcon(Icon = 42)] UI, - [Description("General Action usage and control")] + [Description("Configure general action usage and control settings.")] [TabIcon(Icon = 29)] Auto, - [Description("Targeting settings")] + [Description("Configure targeting settings.")] [TabIcon(Icon = 16)] Target, - [Description("Features that are not core to RSR but are helpful")] + [Description("Configure optional helpful features.")] [TabIcon(Icon = 51)] Extra, - [Description("Debug stuff for developers and rotation writers. Please do not leave this enabled.")] + [Description("Debug options for developers and rotation writers (disable when not in use).")] [TabIcon(Icon = 5)] Debug, - [Description("Specific Autoduty related settings and information")] + [Description("Configure AutoDuty settings and view related information.")] [TabIcon(Icon = 4)] AutoDuty, } diff --git a/RotationSolver/UI/RotationConfigWindow_Config.cs b/RotationSolver/UI/RotationConfigWindow_Config.cs index 6570a9617..fdc7a4281 100644 --- a/RotationSolver/UI/RotationConfigWindow_Config.cs +++ b/RotationSolver/UI/RotationConfigWindow_Config.cs @@ -36,7 +36,6 @@ private static void DrawBasic() private static readonly CollapsingHeaderGroup _baseHeader = new CollapsingHeaderGroup(new Dictionary, Action> { { UiString.ConfigWindow_Basic_Timer.GetDescription, DrawBasicTimer }, - { UiString.ConfigWindow_Basic_AutoSwitch.GetDescription, DrawBasicAutoSwitch }, { UiString.ConfigWindow_Basic_NamedConditions.GetDescription, DrawBasicNamedConditions }, { UiString.ConfigWindow_Basic_Others.GetDescription, DrawBasicOthers }, }); @@ -114,27 +113,21 @@ private static void DrawBasicTimer() { { UiString.ConfigWindow_Basic_SwitchCancelConditionSet.GetDescription, - () => DataCenter.RightSet.SwitchCancelConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.SwitchCancelConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Basic_SwitchManualConditionSet.GetDescription, - () => DataCenter.RightSet.SwitchManualConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.SwitchManualConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Basic_SwitchAutoConditionSet.GetDescription, - () => DataCenter.RightSet.SwitchAutoConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.SwitchAutoConditionSet?.DrawMain(DataCenter.CurrentRotation) }, }) { HeaderSize = 18, }; - private static void DrawBasicAutoSwitch() - { - _allSearchable.DrawItems(Configs.BasicAutoSwitch); - _autoSwitch?.Draw(); - } - private static readonly Dictionary _isOpen = new Dictionary(); private static void DrawBasicNamedConditions() @@ -175,9 +168,9 @@ private static void DrawBasicNamedConditions() removeIndex = i; } - if (value && DataCenter.RightNowRotation != null) + if (value && DataCenter.CurrentRotation != null) { - DataCenter.RightSet.NamedConditions[i].Condition?.DrawMain(DataCenter.RightNowRotation); + DataCenter.RightSet.NamedConditions[i].Condition?.DrawMain(DataCenter.CurrentRotation); } } @@ -287,6 +280,7 @@ private void DrawAuto() private static readonly CollapsingHeaderGroup _autoHeader = new(new Dictionary, Action> { + { UiString.ConfigWindow_Basic_AutoSwitch.GetDescription, DrawBasicAutoSwitch }, { UiString.ConfigWindow_Auto_PrioritiesOrganizer.GetDescription, DrawAutoStatusOrderConfig }, { UiString.ConfigWindow_Auto_ActionUsage.GetDescription, DrawActionUsageControl }, { UiString.ConfigWindow_Auto_HealingCondition.GetDescription, DrawHealingActionCondition }, @@ -297,6 +291,12 @@ private void DrawAuto() HeaderSize = HeaderSize, }; + private static void DrawBasicAutoSwitch() + { + _allSearchable.DrawItems(Configs.BasicAutoSwitch); + _autoSwitch?.Draw(); + } + private static void DrawPvPSpecificControls() { ImGui.TextWrapped(UiString.ConfigWindow_Auto_PvPSpecific.GetDescription()); @@ -328,47 +328,47 @@ private static void DrawHealingActionCondition() { { UiString.ConfigWindow_Auto_HealAreaConditionSet.GetDescription, - () => DataCenter.RightSet.HealAreaConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.HealAreaConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_HealSingleConditionSet.GetDescription, - () => DataCenter.RightSet.HealSingleConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.HealSingleConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_DefenseAreaConditionSet.GetDescription, - () => DataCenter.RightSet.DefenseAreaConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.DefenseAreaConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_DefenseSingleConditionSet.GetDescription, - () => DataCenter.RightSet.DefenseSingleConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.DefenseSingleConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_DispelStancePositionalConditionSet.GetDescription, - () => DataCenter.RightSet.DispelStancePositionalConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.DispelStancePositionalConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_RaiseShirkConditionSet.GetDescription, - () => DataCenter.RightSet.RaiseShirkConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.RaiseShirkConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_MoveForwardConditionSet.GetDescription, - () => DataCenter.RightSet.MoveForwardConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.MoveForwardConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_MoveBackConditionSet.GetDescription, - () => DataCenter.RightSet.MoveBackConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.MoveBackConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_AntiKnockbackConditionSet.GetDescription, - () => DataCenter.RightSet.AntiKnockbackConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.AntiKnockbackConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_SpeedConditionSet.GetDescription, - () => DataCenter.RightSet.SpeedConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.SpeedConditionSet?.DrawMain(DataCenter.CurrentRotation) }, { UiString.ConfigWindow_Auto_NoCastingConditionSet.GetDescription, - () => DataCenter.RightSet.NoCastingConditionSet?.DrawMain(DataCenter.RightNowRotation) + () => DataCenter.RightSet.NoCastingConditionSet?.DrawMain(DataCenter.CurrentRotation) }, }) { diff --git a/RotationSolver/UI/SearchableConfigs/CheckBoxSearch.cs b/RotationSolver/UI/SearchableConfigs/CheckBoxSearch.cs index 68ff8422a..83520c27d 100644 --- a/RotationSolver/UI/SearchableConfigs/CheckBoxSearch.cs +++ b/RotationSolver/UI/SearchableConfigs/CheckBoxSearch.cs @@ -33,8 +33,8 @@ public CheckBoxConditionAbstract(PropertyInfo property) : base(property) _condition = (ConditionBoolean)property.GetValue(Service.Config)!; AdditionalDraw = () => { - if (DataCenter.RightNowRotation == null) return; - GetCondition()?.DrawMain(DataCenter.RightNowRotation); + if (DataCenter.CurrentRotation == null) return; + GetCondition()?.DrawMain(DataCenter.CurrentRotation); }; } diff --git a/RotationSolver/UI/SearchableConfigs/Searchable.cs b/RotationSolver/UI/SearchableConfigs/Searchable.cs index 75040c028..86382fc7f 100644 --- a/RotationSolver/UI/SearchableConfigs/Searchable.cs +++ b/RotationSolver/UI/SearchableConfigs/Searchable.cs @@ -101,7 +101,7 @@ public bool CanDraw if (JobRoles != null) { - var role = DataCenter.RightNowRotation?.Role; + var role = DataCenter.CurrentRotation?.Role; if (role.HasValue) { canDraw = JobRoles.Contains(role.Value); diff --git a/RotationSolver/Updaters/ActionSequencerUpdater.cs b/RotationSolver/Updaters/ActionSequencerUpdater.cs index 6681a6134..db64f531c 100644 --- a/RotationSolver/Updaters/ActionSequencerUpdater.cs +++ b/RotationSolver/Updaters/ActionSequencerUpdater.cs @@ -9,7 +9,7 @@ internal class ActionSequencerUpdater public static void UpdateActionSequencerAction() { if (DataCenter.ConditionSets == null) return; - var customRotation = DataCenter.RightNowRotation; + var customRotation = DataCenter.CurrentRotation; if (customRotation == null) return; var allActions = RotationUpdater.RightRotationActions; diff --git a/RotationSolver/Updaters/ActionUpdater.cs b/RotationSolver/Updaters/ActionUpdater.cs index 3496b814d..1db13d533 100644 --- a/RotationSolver/Updaters/ActionUpdater.cs +++ b/RotationSolver/Updaters/ActionUpdater.cs @@ -59,7 +59,7 @@ internal static void ClearNextAction() internal static void UpdateNextAction() { IPlayerCharacter localPlayer = Player.Object; - var customRotation = DataCenter.RightNowRotation; + var customRotation = DataCenter.CurrentRotation; try { diff --git a/RotationSolver/Updaters/RotationUpdater.cs b/RotationSolver/Updaters/RotationUpdater.cs index ed69e0e15..0d2bfffa1 100644 --- a/RotationSolver/Updaters/RotationUpdater.cs +++ b/RotationSolver/Updaters/RotationUpdater.cs @@ -438,8 +438,8 @@ public static Type[] TryGetTypes(Assembly assembly) public static IEnumerable>? AllGroupedActions => GroupActions([ - .. DataCenter.RightNowRotation?.AllActions ?? [], - .. DataCenter.RightNowDutyRotation?.AllActions ?? []]); + .. DataCenter.CurrentRotation?.AllActions ?? [], + .. DataCenter.CurrentDutyRotation?.AllActions ?? []]); public static IEnumerable>? GroupActions(IEnumerable actions) => actions?.GroupBy(a => @@ -507,10 +507,10 @@ private static void UpdateDutyRotation() Service.Config.DutyRotationChoice.TryGetValue(Svc.ClientState.TerritoryType, out var value); var name = value ?? string.Empty; var type = GetChosenType(rotations, name); - if (type != DataCenter.RightNowDutyRotation?.GetType()) + if (type != DataCenter.CurrentDutyRotation?.GetType()) { - DataCenter.RightNowDutyRotation?.Dispose(); - DataCenter.RightNowDutyRotation = GetRotation(type); + DataCenter.CurrentDutyRotation?.Dispose(); + DataCenter.CurrentDutyRotation = GetRotation(type); } static DutyRotation? GetRotation(Type? t) @@ -538,7 +538,7 @@ private static void UpdateCustomRotation() var rotation = GetChosenRotation(group); - if (rotation != DataCenter.RightNowRotation?.GetType()) + if (rotation != DataCenter.CurrentRotation?.GetType()) { var instance = GetRotation(rotation); if (instance == null) @@ -550,15 +550,15 @@ private static void UpdateCustomRotation() } instance.OnTerritoryChanged(); - DataCenter.RightNowRotation = instance; + DataCenter.CurrentRotation = instance; } - RightRotationActions = DataCenter.RightNowRotation?.AllActions ?? Array.Empty(); + RightRotationActions = DataCenter.CurrentRotation?.AllActions ?? Array.Empty(); return; } CustomRotation.MoveTarget = null; - DataCenter.RightNowRotation = null; + DataCenter.CurrentRotation = null; RightRotationActions = Array.Empty(); static ICustomRotation? GetRotation(Type? t) diff --git a/RotationSolver/Updaters/StateUpdater.cs b/RotationSolver/Updaters/StateUpdater.cs index b42acf424..73ba64cc3 100644 --- a/RotationSolver/Updaters/StateUpdater.cs +++ b/RotationSolver/Updaters/StateUpdater.cs @@ -456,7 +456,7 @@ private static AutoStatus StatusFromCmdOrCondition() private static void AddStatus(ref AutoStatus status, AutoStatus flag, ConditionSet set) { - AddStatus(ref status, flag, () => set.IsTrue(DataCenter.RightNowRotation)); + AddStatus(ref status, flag, () => set.IsTrue(DataCenter.CurrentRotation)); } private static void AddStatus(ref AutoStatus status, AutoStatus flag, Func getValue)