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

Commit f3e0422

Browse files
ArchiDog1998ArchiDog1998
committed
fix: healer fix.
1 parent 4aa9e7a commit f3e0422

File tree

6 files changed

+12
-109
lines changed

6 files changed

+12
-109
lines changed

‎Resources/HostileCastingArea.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,5 +484,7 @@
484484
35948,
485485
35331,
486486
10827,
487-
10799
487+
10799,
488+
19937,
489+
19944
488490
]

‎Resources/RotationSolverRecord.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"ClickingCount": 64697,
3-
"SayingHelloCount": 49,
2+
"ClickingCount": 65516,
3+
"SayingHelloCount": 51,
44
"SaidUsers": []
55
}

‎RotationSolver.Basic/Rotations/Basic/AstrologianRotation.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ static partial void ModifyDrawPvE(ref ActionSetting setting)
7474

7575
static partial void ModifyRedrawPvE(ref ActionSetting setting)
7676
{
77+
setting.StatusNeed = [StatusID.ClarifyingDraw];
7778
setting.ActionCheck = () => DrawnCard != CardType.NONE && Seals.Contains(GetCardSeal(DrawnCard));
7879
}
7980

@@ -97,7 +98,7 @@ static partial void ModifyTheBalancePvE(ref ActionSetting setting)
9798
setting.TargetType = TargetType.Melee;
9899
setting.ActionCheck = () => DrawnCard == CardType.BALANCE;
99100
}
100-
101+
101102
static partial void ModifyTheBolePvE(ref ActionSetting setting)
102103
{
103104
setting.TargetStatusProvide = StatusHelper.AstCardStatus;

‎RotationSolver/Localization/Localization.json

Lines changed: 1 addition & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,106 +1,4 @@
11
{
22
"RotationSolver.Data.UiString.ConfigWindowHeader": "Rotation Solver Settings v",
3-
"RotationSolver.Data.UiString.Commands_Rotation": "Open config window.",
4-
"RotationSolver.Basic.Data.StateCommandType.Manual": "Start the addon in Manual mode. You need to choose the target manually. This will bypass any engage settings that you have set up and will start attacking immediately once something is targeted.",
5-
"RotationSolver.Basic.Data.StateCommandType.Cancel": "Stop the addon. Always remember to turn it off when it is not in use!",
6-
"RotationSolver.Basic.Data.StateCommandType.Auto": "Start the addon in Auto mode. When out of combat or when combat starts, switches the target according to the set condition.",
7-
"RotationSolver.Basic.Data.TargetingType.Big": "Big",
8-
"RotationSolver.Data.UiString.InfoWindowNoMove": "No Move",
9-
"RotationSolver.Data.UiString.InfoWindowMove": "Move",
10-
"RotationSolver.Basic.Data.SpecialCommandType.HealArea": "Open a window to use AoE heal.",
11-
"RotationSolver.Basic.Data.SpecialCommandType.HealSingle": "Open a window to use single heal.",
12-
"RotationSolver.Basic.Data.SpecialCommandType.DefenseArea": "Open a window to use AoE defense.",
13-
"RotationSolver.Basic.Data.SpecialCommandType.DefenseSingle": "Open a window to use single defense.",
14-
"RotationSolver.Basic.Data.SpecialCommandType.MoveForward": "Open a window to move forward.",
15-
"RotationSolver.Basic.Data.SpecialCommandType.MoveBack": "Open a window to move back.",
16-
"RotationSolver.Basic.Data.SpecialCommandType.Burst": "Open a window to burst.",
17-
"RotationSolver.Basic.Data.SpecialCommandType.EndSpecial": "To end this special duration before the set time.",
18-
"RotationSolver.Basic.Data.SpecialCommandType.DispelStancePositional": "Open a window to use Esuna, tank stance actions or True North.",
19-
"RotationSolver.Basic.Data.SpecialCommandType.RaiseShirk": "Open a window to use Raise or Shirk.",
20-
"RotationSolver.Basic.Data.SpecialCommandType.AntiKnockback": "Open a window to use knockback immunity actions.",
21-
"RotationSolver.Basic.Data.SpecialCommandType.Speed": "Open a window to speed up.",
22-
"RotationSolver.Basic.Data.TargetHostileType.AllTargetsCanAttack": "All targets that are in range for any abilities",
23-
"RotationSolver.Data.UiString.ActionAttack": "Attack",
24-
"RotationSolver.Data.UiString.ActionAbility": "Ability",
25-
"RotationSolver.Data.UiString.ActionFriendly": "Friendly",
26-
"RotationSolver.Data.UiString.SpecialCommandType_MoveForward": "Move Forward",
27-
"RotationSolver.Data.UiString.SpecialCommandType_Start": "Start ",
28-
"RotationSolver.Data.UiString.SpecialCommandType_Smart": "Auto Target ",
29-
"RotationSolver.Data.UiString.SpecialCommandType_EndSpecial": "End Special",
30-
"RotationSolver.Basic.Data.TargetingType.Small": "Small",
31-
"RotationSolver.Data.UiString.SpecialCommandType_Off": "Off",
32-
"RotationSolver.Data.UiString.SpecialCommandType_Cancel": "Cancel",
33-
"RotationSolver.Data.UiString.ConfigWindow_About_Punchline": "Analyses PvE combat information in every frame and finds the best action.",
34-
"RotationSolver.Data.UiString.ConfigWindow_About_Clicking100k": "Well, you must be a lazy player!",
35-
"RotationSolver.Data.UiString.ConfigWindow_About_Clicking500k": "You're tiring RS out, give it a break!",
36-
"RotationSolver.Data.UiString.ConfigWindow_Helper_GameVersion": "Game",
37-
"RotationSolver.Data.UiString.ConfigWindow_Helper_SwitchRotation": "Click to switch rotations",
38-
"RotationSolver.Data.UiString.ConfigWindow_ConditionSetDesc": "The condition set you chose, click to modify.",
39-
"RotationSolver.Data.UiString.ConfigWindow_Searching": "Search... ",
40-
"RotationSolver.Data.UiString.ConfigWindow_About_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.",
41-
"RotationSolver.Data.UiString.ConfigWindow_About_Warning": "It is designed for GENERAL COMBAT, not for savage or ultimate. Use it carefully.",
42-
"RotationSolver.Data.UiString.ConfigWindow_About_ClickingCount": "Rotation Solver helped you by clicking actions {0:N0} times.",
43-
"RotationSolver.Data.UiString.ConfigWindow_About_SayHelloCount": "You have said hello to other users {0:N0} times!",
44-
"RotationSolver.Data.UiString.ConfigWindow_About_Macros": "Macro",
45-
"RotationSolver.Data.UiString.ConfigWindow_About_Compatibility": "Compatibility",
46-
"RotationSolver.Data.UiString.ConfigWindow_About_Supporters": "Supporters",
47-
"RotationSolver.Data.UiString.ConfigWindow_About_Links": "Links",
48-
"RotationSolver.UI.RotationConfigWindowTab.Rotations": "All rotations that RS has loaded.",
49-
"RotationSolver.Basic.Data.TargetHostileType.TargetsHaveTarget": "Previously engaged targets (engages on countdown timer)",
50-
"RotationSolver.UI.RotationConfigWindowTab.UI": "Settings about the user interface.",
51-
"RotationSolver.UI.RotationConfigWindowTab.Basic": "Basic settings",
52-
"RotationSolver.UI.RotationConfigWindowTab.Auto": "About some general actions usage and conditions.",
53-
"RotationSolver.UI.RotationConfigWindowTab.Extra": "Some features that shouldn't be included in RS but help you.",
54-
"RotationSolver.UI.RotationConfigWindowTab.Debug": "Debug",
55-
"RotationSolver.UI.RotationConfigWindowTab.Target": "The way to find the targets, hostiles or friends.",
56-
"RotationSolver.Data.UiString.ConfigWindow_Basic_Timer": "Timer",
57-
"RotationSolver.Data.UiString.ConfigWindow_Basic_AutoSwitch": "Auto Switch",
58-
"RotationSolver.Data.UiString.ConfigWindow_Basic_NamedConditions": "Named Conditions",
59-
"RotationSolver.Data.UiString.ConfigWindow_Basic_Others": "Others",
60-
"RotationSolver.UI.RotationConfigWindowTab.List": "Some things that have to be lists.",
61-
"RotationSolver.Data.UiString.ConfigWindow_List_Description": "In this window, you can set the parameters that can be customised using lists.",
62-
"RotationSolver.Data.UiString.ConfigWindow_List_Statuses": "Statuses",
63-
"RotationSolver.Data.UiString.ConfigWindow_List_Actions": "Actions",
64-
"RotationSolver.Data.UiString.ConfigWindow_List_Territories": "Map specific settings",
65-
"RotationSolver.Data.UiString.ConfigWindow_Auto_Description": "Change the way that RS atomatically uses actions.",
66-
"RotationSolver.Data.UiString.ConfigWindow_Auto_ActionUsage": "Action Usage",
67-
"RotationSolver.Data.UiString.ConfigWindow_Auto_ActionCondition": "Action Condition",
68-
"RotationSolver.Data.UiString.ConfigWindow_Auto_StateCondition": "State Condition",
69-
"RotationSolver.Data.UiString.ConfigWindow_Auto_ActionCondition_Description": "This will change the way that Rotation Solver uses actions.",
70-
"MeleeRangeOffsetName": "Melee Range action using offset",
71-
"RotationSolver.Data.UiString.NotInJob": "This option is unavailable while using your current job\n \nRoles or jobs needed:\n{0}",
72-
"InterruptDelayName": "The range of random delay for interrupting hostile targets.",
73-
"InterruptibleMoreCheckName": "Use interrupt abilities if possible.",
74-
"DispelAllName": "Cleanse all dispellable debuffs.",
75-
"HealthForDyingTanksName": "The HP%% for tank to use invulnerability",
76-
"HealthTankRatioName": "Heal tank first if its HP is lower than this.",
77-
"HealthHealerRatioName": "Heal healer first if its HP is lower than this.",
78-
"HealOutOfCombatName": "Heal party members outside of combat.",
79-
"UseHealWhenNotAHealerName": "Use healing abilities when playing a non-healer role",
80-
"OnlyHotOnTanksName": "Use single target healing over time actions only on tanks",
81-
"HealWhenNothingTodoName": "Healing the members with GCD if there is nothing to do in combat.",
82-
"OnlyHealSelfWhenNoHealerName": "Only Heal self When Not a healer",
83-
"AutoBurstName": "Automatically trigger dps burst phase",
84-
"AutoHealName": "Automatic Heal",
85-
"RotationSolver.Data.UiString.ConfigWindow_Auto_ActionUsage_Description": "Which actions Rotation Solver can use.",
86-
"LessMPNoRaiseName": "Never raise player if MP is less than the set value",
87-
"UseTincturesName": "Use Tinctures",
88-
"UseHpPotionsName": "Use HP Potions",
89-
"UseMpPotionsName": "Use MP Potions",
90-
"UseAoeActionName": "Use AoE actions",
91-
"UseAbilityName": "Auto-use abilities",
92-
"AutoHealDescription": "",
93-
"RotationSolver.Data.UiString.NormalTargets": "Normal Targets",
94-
"RotationSolver.Data.UiString.HotTargets": "Targets with HOT",
95-
"RotationSolver.Data.UiString.HpAoe0Gcd": "HP for AoE healing oGCDs",
96-
"RotationSolver.Data.UiString.JobConfigTip": "This config is job specific",
97-
"RotationSolver.Data.UiString.HpAoeGcd": "HP for AoE healing GCDs",
98-
"RotationSolver.Data.UiString.HpSingle0Gcd": "HP for ST healing oGCDs",
99-
"RotationSolver.Data.UiString.HpSingleGcd": "HP for ST healing GCDs",
100-
"RotationSolver.Basic.Attributes.ConfigUnitType.Percent": "Ratio Unit, as percentage.",
101-
"HealWhenNothingTodoDescription": "",
102-
"HealthHealerRatioDescription": "",
103-
"OnlyHotOnTanksDescription": "",
104-
"HealOutOfCombatDescription": "",
105-
"HealthTankRatioDescription": ""
3+
"RotationSolver.Data.UiString.Commands_Rotation": "Open config window."
1064
}

‎RotationSolver/UI/RotationConfigWindow.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2358,6 +2358,7 @@ private static void DrawDebug()
23582358
ImGui.Text(Watcher.ShowStrSelf);
23592359
ImGui.Separator();
23602360
ImGui.Text(Watcher.ShowStrEnemy);
2361+
ImGui.Text(DataCenter.Role.ToString());
23612362
} },
23622363
});
23632364

‎RotationSolver/Updaters/StateUpdater.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
using ECommons.GameHelpers;
1+
using ECommons.DalamudServices;
2+
using ECommons.GameHelpers;
23
using RotationSolver.Basic.Configuration.Conditions;
34

45
namespace RotationSolver.Updaters;
56
internal static class StateUpdater
67
{
78
private static bool CanUseHealAction =>
89
//PvP
9-
DataCenter.Territory?.IsPvpZone ?? false
10+
(DataCenter.Territory?.IsPvpZone ?? false)
1011
//Job
1112
|| (DataCenter.Role == JobRole.Healer || Service.Config.UseHealWhenNotAHealer)
1213
&& Service.Config.AutoHeal

0 commit comments

Comments
 (0)