Skip to content

Handle WKS mission score field rename #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
endfish wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Handle WKS mission score field rename #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions AutoHook/WorldStateUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using FFXIVClientStructs.FFXIV.Client.Game.WKS;
using FFXIVClientStructs.FFXIV.Client.UI.Agent;
using Lumina.Excel.Sheets;
using System.Reflection;

namespace AutoHook;

Expand All @@ -25,6 +26,9 @@ public sealed class WorldStateUpdater : IDisposable {
private readonly Hook<AgentCatch.Delegates.UpdateCatch>? _updateCatchHook;
private readonly Hook<FishingEventHandler.Delegates.PlayAnimation>? _playAnimationHook;
private static IReadOnlyList<Lumina.Excel.Sheets.Action> FshActions = [];
private static readonly FieldInfo? WksMissionScoreField =
typeof(WKSMissionModule.MissionState).GetField("ScoreUInt") ??
typeof(WKSMissionModule.MissionState).GetField("Score");

private bool _needInventoryUpdate = true;

Expand Down Expand Up @@ -305,18 +309,28 @@ private static unsafe WKSInfo.OpState CollectWKSInfo() {
devGrade = wks->State.DevGrade;
currentFateControlRowId = wks->State.CurrentFateControlRowId;
currentFateId = wks->State.CurrentFateId;
currentMissionUnitRowId = wks->State.CurrentMission.MissionUnitRowId;
currentScore = wks->State.CurrentMission.ScoreUInt;
currentRank = wks->State.CurrentMission.Rank;
collectedTotal = wks->State.CurrentMission.CollectedTotal;
collectedIndividual = wks->State.CurrentMission.CollectedIndividual;
var mission = wks->State.CurrentMission;
currentMissionUnitRowId = mission.MissionUnitRowId;
currentScore = GetWksMissionScore(mission);
currentRank = mission.Rank;
collectedTotal = mission.CollectedTotal;
collectedIndividual = mission.CollectedIndividual;
}
}
catch { }

return new WKSInfo.OpState(devGrade, currentFateControlRowId, currentFateId, currentMissionUnitRowId, currentScore, currentRank, collectedTotal, collectedIndividual);
}

private static uint GetWksMissionScore(WKSMissionModule.MissionState mission) {
var score = WksMissionScoreField?.GetValue(mission);
return score switch {
uint value => value,
ushort value => value,
_ => 0,
};
}

private static unsafe WorldState.OpZone CollectZone()
=> new(WeatherManager.Instance()->GetCurrentWeather(), Svc.ClientState.TerritoryType);
}