Update SB + WAR quest battles

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json
index c4c412624743ddd6d1b6a5538ae927be8d7f418e..fd738de54eb090ef69e0bb6c2723fbd9a28f0bdd 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/313_Axe in the Stone.json
@@ -294,6 +294,10 @@
           "StopDistance": 0.5,
           "TerritoryId": 135,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "TestedBossModVersion": "0.1.0.1"
+          },
           "Mount": false
         }
       ]

diff --git a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json
index ead596f44252ed891a30bfa7d3486509a97dab9b..3207a34fee92983c678b392dbcb439afebef19e1 100644 (file)
--- a/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json
+++ b/QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/316_Brutal Strength.json
@@ -158,6 +158,10 @@
           },
           "TerritoryId": 134,
           "InteractionType": "Interact",
+          "AethernetShortcut": [
+            "[Limsa Lominsa] Marauders' Guild",
+            "[Limsa Lominsa] Zephyr Gate (Middle La Noscea)"
+          ],
           "Fly": true
         }
       ]

diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json
index b1c257276ad03d2f9b9219a76a649de05e977dcb..45fff7eba598e489ff9e3624825a131ae8368875 100644 (file)
--- a/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json
+++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Fringes/2821_Eyes Bigger than Her Stomach.json
@@ -33,8 +33,16 @@
             "Z": 135.44316
           },
           "TerritoryId": 612,
-          "InteractionType": "WaitForManualProgress",
-          "Comment": "Use item 2002324 on 6655 after \"weakening\""
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "KillEnemyDataIds": [
+            6655
+          ],
+          "CombatItemUse": {
+            "ItemId": 2002324,
+            "Condition": "Health%",
+            "Value": 50
+          }
         }
       ]
     },

diff --git a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2883_Are They Ill-tempered.json b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2883_Are They Ill-tempered.json
index 59daeacd346116f5e5929db14633310a761fd0d5..3e500340d381cf25645c487dc82cff352f32660d 100644 (file)
--- a/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2883_Are They Ill-tempered.json
+++ b/QuestPaths/4.x - Stormblood/Aether Currents/The Lochs/2883_Are They Ill-tempered.json
@@ -44,8 +44,16 @@
             "Z": 288.09766
           },
           "TerritoryId": 621,
-          "InteractionType": "WaitForManualProgress",
-          "Comment": "Use item 2002315 on 6599 after \"weakening\""
+          "InteractionType": "Combat",
+          "KillEnemyDataIds": [
+            6599
+          ],
+          "EnemySpawnType": "OverworldEnemies",
+          "CombatItemUse": {
+            "ItemId": 2002315,
+            "Condition": "Health%",
+            "Value": 50
+          }
         }
       ]
     },
@@ -66,4 +74,4 @@
       ]
     }
   ]
-}
\ No newline at end of file
+}

diff --git a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
index f3cb71d0a7627b8d6c6a41601d063d81aec802a2..25b404ed783b71a016fd2ef2ce821ba448575da2 100644 (file)
--- a/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
+++ b/QuestPaths/4.x - Stormblood/Class Quests/WAR/2904_The Heart of the Problem.json
@@ -122,6 +122,13 @@
           },
           "TerritoryId": 622,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "TestedBossModVersion": "0.1.0.1",
+            "Notes": [
+              "Keeps attacking the invulnerable boss instead of the mammoths, thus letting your allied NPC die"
+            ]
+          },
           "Fly": true
         }
       ]

diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json
index 44d98e73901f4f70a332c22e96a8ff5c6e2f729e..bcc079a974756f12308bd579b677d7184fd25c55 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/A6.1-Fringes 2/2528_Rhalgr's Beacon.json
@@ -55,7 +55,6 @@
           },
           "TerritoryId": 635,
           "InteractionType": "Interact",
-          "$": "QW: 0 0    0 0    0 0 -> QW: 17 0    0 0    0 64",
           "CompletionQuestVariablesFlags": [
             null,
             null,
@@ -74,7 +73,6 @@
           },
           "TerritoryId": 635,
           "InteractionType": "Interact",
-          "$": "QW: 17 0    0 0    0 64 -> QW: 33 1    0 0    0 192",
           "CompletionQuestVariablesFlags": [
             null,
             null,
@@ -135,6 +133,10 @@
           },
           "TerritoryId": 612,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "TestedBossModVersion": "0.1.0.1"
+          },
           "AethernetShortcut": [
             "[Rhalgr's Reach] Northeastern Rhalgr's Reach",
             "[Rhalgr's Reach] Fringes Gate"

diff --git a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json
index 798f15a1aeb186dd7094860f9860f0185a031764..5b4e722ab95e121c87582247bd5338f032f4c95d 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/A6.2-Peaks 2/2544_The Price of Freedom.json
@@ -116,7 +116,11 @@
           "InteractionType": "Duty",
           "DutyOptions": {
             "ContentFinderConditionId": 242,
-            "Enabled": true
+            "Enabled": true,
+            "Notes": [
+              "(before boss 2) AD doesn't attack magitek pods, but waits for enemies to spawn from them (even though it has explicit waypoints)",
+              "(boss 2) VBM moves out of the towers before their mechanic is resolved, sometimes killing the NPC healer"
+            ]
           }
         }
       ]

diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json
index 426b491ed7d1d0a68aa0108278732633b5a8f29e..45b755de50d0316c072547967caab692fa6d4803 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2549_The Key to Victory.json
@@ -78,6 +78,13 @@
           "StopDistance": 7,
           "TerritoryId": 621,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "TestedBossModVersion": "0.1.0.1",
+            "Notes": [
+              "Navigation gets stuck in various places"
+            ]
+          },
           "AetheryteShortcut": "Lochs - Porta Praetoria"
         }
       ]

diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json
index ccda8a09189c7d46111f90357fc2d95d52554231..2a63e87dd7b91ee58ca53f9bdf8d7b1e983ec54f 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2550_The Resonant.json
@@ -137,7 +137,14 @@
             "Z": 460.34937
           },
           "TerritoryId": 621,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "TestedBossModVersion": "0.1.0.1",
+            "Notes": [
+              "(Fordola) Gets hit by AOEs due to moving into them before the mechanic resolves"
+            ]
+          }
         }
       ]
     },

diff --git a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json
index 5c01d821106865a1facf2530222667daab5bc3c7..4aa23c86c74f8328086b2f9ecd5a42aea99bc24a 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/A7-Lochs/2552_The Measure of His Reach.json
@@ -104,7 +104,11 @@
             "Z": -107.133606
           },
           "TerritoryId": 621,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "TestedBossModVersion": "0.1.0.1"
+          }
         }
       ]
     },

diff --git a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json
index ace6118a9421756f7becda761281fe600b59a5cb..5d23ce7a6616d76cb64294ed468ba336890837ba 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/B-4.1/2972_Return of the Bull.json
@@ -76,7 +76,11 @@
           },\r
           "StopDistance": 5,\r
           "TerritoryId": 737,\r
-          "InteractionType": "SinglePlayerDuty"\r
+          "InteractionType": "SinglePlayerDuty",\r
+          "SinglePlayerDutyOptions": {\r
+            "Enabled": true,\r
+            "TestedBossModVersion": "0.1.0.1"\r
+          }\r
         }\r
       ]\r
     },\r

diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json
index ab3f9d516f57278ef29d40d8425ae779352771ca..11e8ac96fe964568f2b221400dc964dd57a8c64f 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3024_Hope on the Waves.json
@@ -49,7 +49,11 @@
             "Z": 861.38696\r
           },\r
           "TerritoryId": 613,\r
-          "InteractionType": "SinglePlayerDuty"\r
+          "InteractionType": "SinglePlayerDuty",\r
+          "SinglePlayerDutyOptions": {\r
+            "Enabled": true,\r
+            "TestedBossModVersion": "0.1.0.1"\r
+          }\r
         }\r
       ]\r
     },\r

diff --git a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json
index 480b6717f941937be89324fea36ba23a08f56d4f..b1bfc5b5f37875f1edbb08976f442159777a2314 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/C-4.2/3027_His Forgotten Home.json
@@ -77,7 +77,11 @@
             "Z": -344.13672\r
           },\r
           "TerritoryId": 614,\r
-          "InteractionType": "SinglePlayerDuty"\r
+          "InteractionType": "SinglePlayerDuty",\r
+          "SinglePlayerDutyOptions": {\r
+            "Enabled": true,\r
+            "TestedBossModVersion": "0.1.0.1"\r
+          }\r
         }\r
       ]\r
     },\r

diff --git a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json
index acc572afacd3b4af2985c0aead1f286a13aac475..d2843d31b8c4d6c3ab5bd7d6ed3ff72857450b28 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/D-4.3/3076_Emissary of the Dawn.json
@@ -29,6 +29,10 @@
           },\r
           "TerritoryId": 351,\r
           "InteractionType": "SinglePlayerDuty",\r
+          "SinglePlayerDutyOptions": {\r
+            "Enabled": true,\r
+            "TestedBossModVersion": "0.1.0.1"\r
+          },\r
           "DialogueChoices": [\r
             {\r
               "Type": "YesNo",\r

diff --git a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json
index cd563068b6af97030b4f80409027e8f3a15943f1..12e2c83c45bf6a33bbc5748d8be4a3c43b63f264 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/E-4.4/3147_The Will of the Moon.json
@@ -88,6 +88,13 @@
           },
           "TerritoryId": 622,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "TestedBossModVersion": "0.1.0.1",
+            "Notes": [
+              "(Magnai) Keeps focussing the boss instead of the axes, thus getting killed by the AOEs"
+            ]
+          },
           "Fly": true
         }
       ]

diff --git a/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json b/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json
index 57a652e9dba4621eb68007254bc8aec042f5fa35..76e5fdb6979bdf767ca3786ca2f7c96c171b81b9 100644 (file)
--- a/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json
+++ b/QuestPaths/4.x - Stormblood/MSQ/H-4.55/3185_A Requiem for Heroes.json
@@ -48,7 +48,16 @@
             "Z": 103.74609
           },
           "TerritoryId": 829,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "Notes": [
+              "(phase 1) Need to manually move in range to trigger combat",
+              "(phase 1) VBM doesn't know about some AOEs (e.g. Vein Splitter)",
+              "(phase 1) VBM ignores markers to stack on Lyse (she still survives)",
+              "(phase 2) AI can walk outside the arena to get a bleed + damage down when dodging mechanics"
+            ]
+          }
         }
       ]
     },

diff --git a/Questionable/Functions/GameFunctions.cs b/Questionable/Functions/GameFunctions.cs
index 1516b57dae9ec30c3d7c76b851b30381efa58e99..d474ffa5f24ef60d7f2c0a1ce091e7fe2371b40f 100644 (file)
--- a/Questionable/Functions/GameFunctions.cs
+++ b/Questionable/Functions/GameFunctions.cs
@@ -447,7 +447,8 @@ internal sealed unsafe class GameFunctions
                _condition[ConditionFlag.OccupiedInQuestEvent] || _condition[ConditionFlag.OccupiedInCutSceneEvent] ||
                _condition[ConditionFlag.Casting] || _condition[ConditionFlag.Unknown57] ||
                _condition[ConditionFlag.BetweenAreas] || _condition[ConditionFlag.BetweenAreas51] ||
-               _condition[ConditionFlag.Jumping61] || _condition[ConditionFlag.Gathering42];
+               _condition[ConditionFlag.Jumping61] || _condition[ConditionFlag.Gathering42] ||
+               _condition[ConditionFlag.Jumping];
     }
 
     public bool IsOccupiedWithCustomDeliveryNpc(Quest? currentQuest)