From fd08a7249a32ad705778dc0e30e7007805ee0ba8 Mon Sep 17 00:00:00 2001 From: Liza Carvelli Date: Sat, 29 Mar 2025 22:52:45 +0100 Subject: [PATCH] API 12 --- .woodpecker/build.yaml | 9 ++++++--- LLib | 2 +- Questionable/Data/TerritoryData.cs | 2 +- Questionable/Functions/GameFunctions.cs | 8 ++++---- Questionable/Model/QuestInfo.cs | 2 +- .../QuestComponents/QuickAccessButtonsComponent.cs | 2 +- 6 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 740ae4ad..d10c34e7 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -1,5 +1,6 @@ when: - event: tag + ref: refs/tags/v* - event: push - event: pull_request @@ -10,7 +11,7 @@ steps: - name: dotnet restore image: mcr.microsoft.com/dotnet/sdk:9.0-noble commands: - - dotnet restore --packages $CI_WORKSPACE/.nuget + - dotnet restore /p:Configuration=Release --packages $CI_WORKSPACE/.nuget - name: dotnet build image: mcr.microsoft.com/dotnet/sdk:9.0-noble @@ -23,9 +24,10 @@ steps: commands: - mkdir release - mv Questionable/dist/Questionable/latest.zip release/Questionable-${CI_COMMIT_TAG##v}.zip - - mv Questionable/dist/Questionable/Questionable.json release/Questionable-${CI_COMMIT_TAG##v}.json + - mv Questionable/dist/Questionable/Questionable.json release/Questionable-${CI_COMMIT_TAG##v}.json.d12 when: - event: tag + ref: refs/tags/v* - name: prepare release image: woodpeckerci/plugin-release @@ -34,9 +36,10 @@ steps: draft: true files: - "release/*.zip" - - "release/*.json" + - "release/*.json.*" api_key: from_secret: ACCESS_TOKEN checksum: sha256 when: - event: tag + ref: refs/tags/v* diff --git a/LLib b/LLib index 8f995a3f..acddd5aa 160000 --- a/LLib +++ b/LLib @@ -1 +1 @@ -Subproject commit 8f995a3ff27c55b585a679415d350bb90bcc3fb7 +Subproject commit acddd5aad13f92427987ddd7f81c19386ed979b4 diff --git a/Questionable/Data/TerritoryData.cs b/Questionable/Data/TerritoryData.cs index 342f631d..01242add 100644 --- a/Questionable/Data/TerritoryData.cs +++ b/Questionable/Data/TerritoryData.cs @@ -128,7 +128,7 @@ internal sealed class TerritoryData private static uint LookupContentFinderConditionForQuestBattle(IDataManager dataManager, uint questBattleId) { if (questBattleId >= 5000) - return dataManager.GetExcelSheet().GetRow(questBattleId).Order; + return dataManager.GetExcelSheet().GetRow(questBattleId).ContentFinderCondition.RowId; else return dataManager.GetExcelSheet().GetRow(questBattleId).Unknown0; } diff --git a/Questionable/Functions/GameFunctions.cs b/Questionable/Functions/GameFunctions.cs index d474ffa5..e8f94d26 100644 --- a/Questionable/Functions/GameFunctions.cs +++ b/Questionable/Functions/GameFunctions.cs @@ -44,7 +44,7 @@ internal sealed unsafe class GameFunctions private readonly ILogger _logger; private readonly AbandonDutyDelegate _abandonDuty; - private readonly ReadOnlyDictionary _territoryToAetherCurrentCompFlgSet; + private readonly ReadOnlyDictionary _territoryToAetherCurrentCompFlgSet; private readonly ReadOnlyDictionary _contentFinderConditionToContentId; public GameFunctions( @@ -73,8 +73,8 @@ internal sealed unsafe class GameFunctions _territoryToAetherCurrentCompFlgSet = dataManager.GetExcelSheet() .Where(x => x.RowId > 0) - .Where(x => x.Unknown4 > 0) - .ToDictionary(x => (ushort)x.RowId, x => x.Unknown4) + .Where(x => x.AetherCurrentCompFlgSet.RowId > 0) + .ToDictionary(x => (ushort)x.RowId, x => x.AetherCurrentCompFlgSet.RowId) .AsReadOnly(); _contentFinderConditionToContentId = dataManager.GetExcelSheet() .Where(x => x.RowId > 0 && x.Content.RowId > 0) @@ -97,7 +97,7 @@ internal sealed unsafe class GameFunctions var playerState = PlayerState.Instance(); return playerState != null && - _territoryToAetherCurrentCompFlgSet.TryGetValue(territoryId, out byte aetherCurrentCompFlgSet) && + _territoryToAetherCurrentCompFlgSet.TryGetValue(territoryId, out uint aetherCurrentCompFlgSet) && playerState->IsAetherCurrentZoneComplete(aetherCurrentCompFlgSet); } diff --git a/Questionable/Model/QuestInfo.cs b/Questionable/Model/QuestInfo.cs index b7efde87..a5f3de7c 100644 --- a/Questionable/Model/QuestInfo.cs +++ b/Questionable/Model/QuestInfo.cs @@ -67,7 +67,7 @@ internal sealed class QuestInfo : IQuestInfo PreviousInstanceContentJoin = (EQuestJoin)quest.InstanceContentJoin; GrandCompany = (GrandCompany)quest.GrandCompany.RowId; AlliedSociety = (EAlliedSociety)quest.BeastTribe.RowId; - AlliedSocietyQuestGroup = quest.Unknown11; + AlliedSocietyQuestGroup = quest.DailyQuestPool; AlliedSocietyRank = (int)quest.BeastReputationRank.RowId; ClassJobs = QuestInfoUtils.AsList(quest.ClassJobCategory0.ValueNullable!); IsSeasonalEvent = quest.Festival.RowId != 0; diff --git a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs index 0239d09b..172df115 100644 --- a/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs +++ b/Questionable/Windows/QuestComponents/QuickAccessButtonsComponent.cs @@ -62,7 +62,7 @@ internal sealed class QuickAccessButtonsComponent public unsafe void Draw() { var map = AgentMap.Instance(); - using (var unused = ImRaii.Disabled(map == null || map->IsFlagMarkerSet == 0 || + using (var unused = ImRaii.Disabled(map == null || map->IsFlagMarkerSet || map->FlagMapMarker.TerritoryId != _clientState.TerritoryType || !_navmeshIpc.IsReady)) { -- 2.30.2