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

Commit

Permalink
fix: .net8
Browse files Browse the repository at this point in the history
  • Loading branch information
ArchiDog1998 committed Mar 20, 2024
1 parent 501e846 commit 7ddd01f
Show file tree
Hide file tree
Showing 9 changed files with 61 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<TargetFramework>net7.0-windows</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Authors>ArchiTed</Authors>
<Version>4.2.1.1</Version>
Expand Down
1 change: 1 addition & 0 deletions Resources/AnimationLockTime.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"3": 0.6,
"5": 2.1,
"6": 2.1,
"9": 0.6,
"15": 0.6,
"16": 0.6,
Expand Down
6 changes: 5 additions & 1 deletion Resources/HostileCastingArea.json
Original file line number Diff line number Diff line change
Expand Up @@ -522,5 +522,9 @@
34695,
12923,
13143,
13166
13166,
20154,
21515,
21521,
20182
]
4 changes: 2 additions & 2 deletions Resources/RotationSolverRecord.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"ClickingCount": 104219,
"SayingHelloCount": 173,
"ClickingCount": 105963,
"SayingHelloCount": 175,
"SaidUsers": []
}
43 changes: 32 additions & 11 deletions RotationSolver.Basic/Helpers/MarkingHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,49 @@

namespace RotationSolver.Basic.Helpers;

internal enum HeadMarker : byte
{
Attack1,
Attack2,
Attack3,
Attack4,
Attack5,
Bind1,
Bind2,
Bind3,
Stop1,
Stop2,
Square,
Circle,
Cross,
Triangle,
Attack6,
Attack7,
Attack8,
}

internal class MarkingHelper
{
internal unsafe static long GetMarker(uint index) => MarkingController.Instance()->MarkerArray[index];
internal unsafe static long GetMarker(HeadMarker index) => MarkingController.Instance()->MarkerArray[(int)index];

internal static bool HaveAttackChara => AttackSignTargets.Any(id => id != GameObject.InvalidGameObjectId);

internal static long[] AttackSignTargets =>
[
GetMarker(0),
GetMarker(1),
GetMarker(2),
GetMarker(3),
GetMarker(4),
GetMarker(14),
GetMarker(15),
GetMarker(16),
GetMarker(HeadMarker.Attack1),
GetMarker(HeadMarker.Attack2),
GetMarker(HeadMarker.Attack3),
GetMarker(HeadMarker.Attack4),
GetMarker(HeadMarker.Attack5),
GetMarker(HeadMarker.Attack6),
GetMarker(HeadMarker.Attack7),
GetMarker(HeadMarker.Attack8),
];

internal static long[] StopTargets =>
[
GetMarker(8),
GetMarker(9),
GetMarker(HeadMarker.Stop1),
GetMarker(HeadMarker.Stop2),
];

internal unsafe static IEnumerable<BattleChara> FilterStopCharaes(IEnumerable<BattleChara> charas)
Expand Down
19 changes: 15 additions & 4 deletions RotationSolver/Localization/Localization.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
"RotationSolver.Data.UiString.ConfigWindow_Auto_HealSingleConditionSet": "Heal Single Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_DefenseAreaConditionSet": "Defense Area Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_DefenseSingleConditionSet": "Defense Single Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_DispelStancePositionalConditionSet": "Esuna Stance North Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_DispelStancePositionalConditionSet": "Dispel Stance Positional Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_RaiseShirkConditionSet": "Raise Shirk Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_MoveForwardConditionSet": "Move Forward Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_MoveBackConditionSet": "Move Back Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_AntiKnockbackConditionSet": "Anti Knockback Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_SpeedConditionSet": "Speed Forced Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_LimitBreakConditionSet": "Limit Break Condition",
"RotationSolver.Data.UiString.ConfigWindow_Auto_LimitBreakConditionSet": "Limit Break Forced Condition",
"RotationSolver.Data.UiString.ActionSequencer_NotDescription": "Click to make it reverse.\nIs reversed : {0}",
"RotationSolver.Data.UiString.ActionSequencer_Delay_Description": "Delay its turning to true.",
"RotationSolver.Basic.Configuration.Conditions.LogicalType.And": "&&",
Expand All @@ -114,7 +114,7 @@
"HealthForDyingTanksName": "The HP%% for tank to use invulnerability",
"HealthTankRatioName": "Heal tank first if its HP is lower than this.",
"HealthHealerRatioName": "Heal healer first if its HP is lower than this.",
"HealOutOfCombatName": "Heal party members outside of combat.",
"HealOutOfCombatName": "Heal members outside of combat.",
"UseHealWhenNotAHealerName": "Use healing abilities when playing a non-healer role",
"OnlyHotOnTanksName": "Use single target healing over time actions only on tanks",
"HealWhenNothingTodoName": "Healing the members with GCD if there is nothing to do in combat.",
Expand Down Expand Up @@ -394,5 +394,16 @@
"RotationSolver.Data.UiString.TimelinePositionOffset": "Position Offset",
"RotationSolver.Data.UiString.ConfigWindow_List_NoCastingStatus": "No Casting debuffs",
"RotationSolver.Data.UiString.ConfigWindow_List_NoCastingStatusDesc": "No Casting debuffs List",
"RotationSolver.Data.UiString.ConfigWindow_Actions_CheckStatus": "Should this action check the stauts."
"RotationSolver.Data.UiString.ConfigWindow_Actions_CheckStatus": "Should this action check the stauts.",
"RotationSolver.Data.UiString.NormalTargets": "Normal Targets",
"RotationSolver.Data.UiString.HotTargets": "Targets with HOT",
"RotationSolver.Data.UiString.HpAoe0Gcd": "HP for AoE healing oGCDs",
"RotationSolver.Data.UiString.HpAoeGcd": "HP for AoE healing GCDs",
"RotationSolver.Data.UiString.HpSingle0Gcd": "HP for ST healing oGCDs",
"RotationSolver.Data.UiString.HpSingleGcd": "HP for ST healing GCDs",
"HealWhenNothingTodoBelowName": "When their minimum HP is lower than this.",
"HealWhenNothingTodoDelayName": "The delay of this type of healing.",
"HealthDifferenceName": "HP for standard deviation for using AoE heal.",
"AutoHealTimeToKillName": "Stop healing when time to kill is lower then...",
"RotationSolver.Data.UiString.ConfigWindow_DutyRotationDesc": "The duty rotation you chose, click to modify."
}
5 changes: 3 additions & 2 deletions RotationSolver/Localization/LocalizationManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ internal static string Local(this string key, string @default)
public static void InIt()
{
#if DEBUG
var dirInfo = new DirectoryInfo(typeof(LocalizationManager).Assembly.Location);
dirInfo = dirInfo.Parent!.Parent!.Parent!.Parent!;

var dirInfo = Svc.PluginInterface.AssemblyLocation.Directory;
dirInfo = dirInfo?.Parent!.Parent!.Parent!.Parent!;


var directory = dirInfo.FullName + @"\Localization";
Expand Down
2 changes: 1 addition & 1 deletion XIVPainter

0 comments on commit 7ddd01f

Please sign in to comment.