Update for post-ARR quest battles

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 8071589908ccb80f8276328cea4ae57eb959283b..028e926c81210168c0f147d56c1c7b98b5593633 100644 (file)
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,5 @@
 <Project>
     <PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
-        <Version>4.19</Version>
+        <Version>4.20</Version>
     </PropertyGroup>
 </Project>

diff --git a/QuestPathGenerator/RoslynElements/SinglePlayerDutyOptionsExtensions.cs b/QuestPathGenerator/RoslynElements/SinglePlayerDutyOptionsExtensions.cs
index 7a545318f6146eee5f44932a5b4609ca69f5ec77..d37a85a26012bdfc79af1584cc75f4df5164d02c 100644 (file)
--- a/QuestPathGenerator/RoslynElements/SinglePlayerDutyOptionsExtensions.cs
+++ b/QuestPathGenerator/RoslynElements/SinglePlayerDutyOptionsExtensions.cs
@@ -21,8 +21,7 @@ internal static class SinglePlayerDutyOptionsExtensions
                             Assignment(nameof(SinglePlayerDutyOptions.Enabled),
                                     dutyOptions.Enabled, emptyOptions.Enabled)
                                 .AsSyntaxNodeOrToken(),
-                            Assignment(nameof(SinglePlayerDutyOptions.Notes),
-                                    dutyOptions.Notes, emptyOptions.Notes)
+                            AssignmentList(nameof(SinglePlayerDutyOptions.Notes), dutyOptions.Notes)
                                 .AsSyntaxNodeOrToken(),
                             Assignment(nameof(SinglePlayerDutyOptions.Index),
                                     dutyOptions.Index, emptyOptions.Index)

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json
index d20209778e1631eda00cbbafdf96758df2671ff2..86eb28043cf826337a88760030fc2cee03d2489e 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E3-2.3/1460_Brave New Companions.json
@@ -100,6 +100,28 @@
             2
           ]
         },
+        {
+          "Position": {
+            "X": 86.662384,
+            "Y": 28.34813,
+            "Z": -627.5218
+          },
+          "TerritoryId": 156,
+          "InteractionType": "WalkTo",
+          "Fly": true,
+          "SkipConditions": {
+            "StepIf": {
+              "CompletionQuestVariablesFlags": [
+                null,
+                null,
+                null,
+                null,
+                null,
+                32
+              ]
+            }
+          }
+        },
         {
           "DataId": 1009143,
           "Position": {
@@ -109,7 +131,6 @@
           },
           "TerritoryId": 156,
           "InteractionType": "Interact",
-          "Fly": true,
           "$": "1 112  0 0  0 2 -> 2 96  0 0  0 34",
           "CompletionQuestVariablesFlags": [
             null,

diff --git a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/4591_The Steps of Faith.json b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/4591_The Steps of Faith.json
index eb05bcad29067187dc959f8307a7c3875bd86cec..90686f33bc6fc8064df44402fa8d153f8237fd2e 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/4591_The Steps of Faith.json
+++ b/QuestPaths/2.x - A Realm Reborn/MSQ-2/E6-2.55/4591_The Steps of Faith.json
@@ -28,7 +28,16 @@
             "Z": -328.66406
           },
           "TerritoryId": 155,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "TestedBossModVersion": 292,
+            "Notes": [
+              "WIP: Needs to be re-tested",
+              "AI doesn't move after starting the instance, so enemies won't be triggered",
+              "(First Barrier) If the player is too far south, after being stunned by Vishap's roar, AI doesn't move out of the AOE and dies to the Cauterize"
+            ]
+          }
         }
       ]
     },

diff --git a/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json b/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json
index a883ac643b293a3e16c4798893712e0226795453..7112086e9162cd71063595292d1f056ce99a9e72 100644 (file)
--- a/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json
+++ b/QuestPaths/3.x - Heavensward/Class Quests/WAR/586_Duty and the Beast.json
@@ -46,6 +46,10 @@
           },
           "TerritoryId": 155,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "TestedBossModVersion": 292
+          },
           "Fly": true
         }
       ]

diff --git a/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json
index 2ab1b1a9cf9f1a8fa835ef9d548d0c58299e9f07..1fc5d8336233edcf12ab77ed0ac11d6e5f58ee96 100644 (file)
--- a/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json
+++ b/QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json
@@ -31,7 +31,10 @@
           "InteractionType": "SinglePlayerDuty",
           "SinglePlayerDutyOptions": {
             "Enabled": true,
-            "TestedBossModVersion": 292
+            "TestedBossModVersion": 292,
+            "Notes": [
+              "Will not move into melee range to kill the gate; Alphinaud will kill it after a while"
+            ]
           }
         }
       ]

diff --git a/Questionable/Controller/Utils/PartyWatchDog.cs b/Questionable/Controller/Utils/PartyWatchDog.cs
index 9e7a0cc7247cb40340739ef5ecfd471fa852a0d6..c443954011bd46fabc5cecebc22508008ae5c0b4 100644 (file)
--- a/Questionable/Controller/Utils/PartyWatchDog.cs
+++ b/Questionable/Controller/Utils/PartyWatchDog.cs
@@ -81,8 +81,10 @@ internal sealed class PartyWatchDog : IDisposable
                 return;
 
             byte memberCount = groupManager->MainGroup.MemberCount;
-            _logger.LogDebug("Terrritory {TerritoryId} with {MemberCount} members", _uncheckedTeritoryId, memberCount);
-            if (memberCount > 1)
+            bool isInAlliance = groupManager->MainGroup.IsAlliance;
+            _logger.LogDebug("Territory {TerritoryId} with {MemberCount} members, alliance: {IsInAlliance}",
+                _uncheckedTeritoryId, memberCount, isInAlliance);
+            if (memberCount > 1 || isInAlliance)
                 StopIfRunning("Other party members present");
 
             _uncheckedTeritoryId = null;

diff --git a/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs b/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs
index 18f7012c440c3bf87f265ee19d42fcc9872e2f2e..c51de1e5ef5ba690575716689af27a33873530f1 100644 (file)
--- a/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs
+++ b/Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs
@@ -271,7 +271,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
                 ImGui.BulletText("Will always use BossMod for combat (ignoring the configured combat module).");
                 ImGui.BulletText("Only a small subset of quest battles have been tested - most of which are in the MSQ.");
                 ImGui.BulletText("When retrying a failed battle, it will always start at 'Normal' difficulty.");
-                ImGui.BulletText("Please don't enable this option when using a BossMod fork (such as Reborn);\nwith the combat changes, it is unlikely to be compatible.");
+                ImGui.BulletText("Please don't enable this option when using a BossMod fork (such as Reborn);\nwith the missing combat module configuration, it is unlikely to be compatible.");
             }
 
 #if false