API 12

diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml
index 740ae4ade55888d36be48ae7e668c18198f19dfd..d10c34e76a22db3be77322e4bec4a9109d2ef504 100644 (file)
--- 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 8f995a3ff27c55b585a679415d350bb90bcc3fb7..acddd5aad13f92427987ddd7f81c19386ed979b4 160000 (submodule)
--- 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 342f631d48b2dca7a702c8956270161c76db7084..01242adde8329571be8215a2553104cee093b006 100644 (file)
--- 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<InstanceContent>().GetRow(questBattleId).Order;
+            return dataManager.GetExcelSheet<InstanceContent>().GetRow(questBattleId).ContentFinderCondition.RowId;
         else
             return dataManager.GetExcelSheet<QuestBattleResident>().GetRow(questBattleId).Unknown0;
     }

diff --git a/Questionable/Functions/GameFunctions.cs b/Questionable/Functions/GameFunctions.cs
index d474ffa5f24ef60d7f2c0a1ce091e7fe2371b40f..e8f94d266bb524ec27c9e8828f963fc030d8cfba 100644 (file)
--- a/Questionable/Functions/GameFunctions.cs
+++ b/Questionable/Functions/GameFunctions.cs
@@ -44,7 +44,7 @@ internal sealed unsafe class GameFunctions
     private readonly ILogger<GameFunctions> _logger;
     private readonly AbandonDutyDelegate _abandonDuty;
 
-    private readonly ReadOnlyDictionary<ushort, byte> _territoryToAetherCurrentCompFlgSet;
+    private readonly ReadOnlyDictionary<ushort, uint> _territoryToAetherCurrentCompFlgSet;
     private readonly ReadOnlyDictionary<uint, uint> _contentFinderConditionToContentId;
 
     public GameFunctions(
@@ -73,8 +73,8 @@ internal sealed unsafe class GameFunctions
 
         _territoryToAetherCurrentCompFlgSet = dataManager.GetExcelSheet<TerritoryType>()
             .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<ContentFinderCondition>()
             .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 b7efde8775cecb68eef6b6540d940a6a1fa06109..a5f3de7ca1547cf32eb7683913836f3556a445cd 100644 (file)
--- 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 0239d09b1776f9594a86f39a6edb5574f4da73ea..172df115a40661bb08fa6d36cd322e5421caed24 100644 (file)
--- 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))
         {