Add special handling for Lahabrea fight

QuestPathGenerator/RoslynElements/QuestStepExtensions.cs

@@ -108,7 +108,7 @@ internal static class QuestStepExtensions
                             AssignmentList(nameof(QuestStep.ComplexCombatData), step.ComplexCombatData)
                                 .AsSyntaxNodeOrToken(),
                             Assignment(nameof(QuestStep.CombatItemUse), step.CombatItemUse,
-                                emptyStep.CombatItemUse)
+                                    emptyStep.CombatItemUse)
                                 .AsSyntaxNodeOrToken(),
                             Assignment(nameof(QuestStep.CombatDelaySecondsAtStart),
                                     step.CombatDelaySecondsAtStart,
@@ -123,14 +123,8 @@ internal static class QuestStepExtensions
                             Assignment(nameof(QuestStep.AutoDutyEnabled),
                                     step.AutoDutyEnabled, emptyStep.AutoDutyEnabled)
                                 .AsSyntaxNodeOrToken(),
-                            Assignment(nameof(QuestStep.BossModEnabled),
+                            Assignment(nameof(QuestStep.SinglePlayerDutyOptions), step.SinglePlayerDutyOptions,
-                                    step.BossModEnabled, emptyStep.BossModEnabled)
+                                emptyStep.SinglePlayerDutyOptions)
-                                .AsSyntaxNodeOrToken(),
-                            Assignment(nameof(QuestStep.BossModNotes),
-                                    step.BossModNotes, emptyStep.BossModNotes)
-                                .AsSyntaxNodeOrToken(),
-                            Assignment(nameof(QuestStep.SinglePlayerDutyIndex),
-                                    step.SinglePlayerDutyIndex, emptyStep.SinglePlayerDutyIndex)
                                 .AsSyntaxNodeOrToken(),
                             Assignment(nameof(QuestStep.SkipConditions), step.SkipConditions,
                                     emptyStep.SkipConditions)

QuestPathGenerator/RoslynElements/SinglePlayerDutyOptionsExtensions.cs

@@ -0,0 +1,31 @@
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Questionable.Model.Questing;
+using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
+using static Questionable.QuestPathGenerator.RoslynShortcuts;
+
+namespace Questionable.QuestPathGenerator.RoslynElements;
+
+internal static class SinglePlayerDutyOptionsExtensions
+{
+    public static ExpressionSyntax ToExpressionSyntax(this SinglePlayerDutyOptions dutyOptions)
+    {
+        var emptyOptions = new SinglePlayerDutyOptions();
+        return ObjectCreationExpression(
+                IdentifierName(nameof(SinglePlayerDutyOptions)))
+            .WithInitializer(
+                InitializerExpression(
+                    SyntaxKind.ObjectInitializerExpression,
+                    SeparatedList<ExpressionSyntax>(
+                        SyntaxNodeList(
+                            Assignment(nameof(SinglePlayerDutyOptions.Enabled),
+                                    dutyOptions.Enabled, emptyOptions.Enabled)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(SinglePlayerDutyOptions.Notes),
+                                    dutyOptions.Notes, emptyOptions.Notes)
+                                .AsSyntaxNodeOrToken(),
+                            Assignment(nameof(SinglePlayerDutyOptions.Index),
+                                    dutyOptions.Index, emptyOptions.Index)
+                                .AsSyntaxNodeOrToken()))));
+    }
+}

QuestPathGenerator/RoslynShortcuts.cs

@@ -62,6 +62,7 @@ public static class RoslynShortcuts
                 ComplexCombatData complexCombatData => complexCombatData.ToExpressionSyntax(),
                 QuestWorkValue questWorkValue => questWorkValue.ToExpressionSyntax(),
                 List<QuestWorkValue> list => list.ToExpressionSyntax(), // TODO fix in AssignmentList
+                SinglePlayerDutyOptions dutyOptions => dutyOptions.ToExpressionSyntax(),
                 SkipConditions skipConditions => skipConditions.ToExpressionSyntax(),
                 SkipStepConditions skipStepConditions => skipStepConditions.ToExpressionSyntax(),
                 SkipItemConditions skipItemCondition => skipItemCondition.ToExpressionSyntax(),

QuestPaths/2.x - A Realm Reborn/Class Quests/BRD/76_The One That Got Away.json

@@ -57,7 +57,9 @@
           },
           "TerritoryId": 153,
           "InteractionType": "SinglePlayerDuty",
-          "SinglePlayerDutyIndex": 1,
+          "SinglePlayerDutyOptions": {
+            "Index": 1
+          },
           "Fly": true
         }
       ]

QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/439_Proof of Might.json

@@ -62,7 +62,9 @@
           },
           "TerritoryId": 154,
           "InteractionType": "SinglePlayerDuty",
-          "SinglePlayerDutyIndex": 1,
+          "SinglePlayerDutyOptions": {
+            "Index": 1
+          },
           "AetheryteShortcut": "North Shroud - Fallgourd Float",
           "Fly": true
         }

QuestPaths/2.x - A Realm Reborn/Class Quests/DRG/56_Lance of Destiny.json

@@ -120,7 +120,9 @@
           },
           "TerritoryId": 152,
           "InteractionType": "SinglePlayerDuty",
-          "SinglePlayerDutyIndex": 1
+          "SinglePlayerDutyOptions": {
+            "Index": 1
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/558_The Spirit Is Willing.json

@@ -140,6 +140,9 @@
           },
           "TerritoryId": 141,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "Fly": true
         }
       ]

QuestPaths/2.x - A Realm Reborn/Class Quests/MNK/567_Return of the Holyfist.json

@@ -92,7 +92,9 @@
           },
           "TerritoryId": 130,
           "InteractionType": "SinglePlayerDuty",
-          "SinglePlayerDutyIndex": 1,
+          "SinglePlayerDutyOptions": {
+            "Index": 1
+          },
           "AetheryteShortcut": "Ul'dah"
         }
       ]

QuestPaths/2.x - A Realm Reborn/Class Quests/WAR/1054_How to Quit You.json

@@ -35,6 +35,9 @@
           },
           "TerritoryId": 137,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "AetheryteShortcut": "Eastern La Noscea - Wineport",
           "Fly": true
         }

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/147_Trial by Wind.json

@@ -116,6 +116,9 @@
           },
           "TerritoryId": 152,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "Fly": true
         }
       ]

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/91_Trial by Wind.json

@@ -65,7 +65,8 @@
           "AetheryteShortcut": "East Shroud - Hawthorne Hut",
           "SkipConditions": {
             "AetheryteShortcutIf": {
-              "InSameTerritory": true
+              "InSameTerritory": true,
+              "AetheryteLocked": "East Shroud - Hawthorne Hut"
             }
           }
         }
@@ -116,7 +117,10 @@
             "Z": 35.568726
           },
           "TerritoryId": 152,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/Class Quests/WHM/92_Trial by Water.json

@@ -33,6 +33,39 @@
     {
       "Sequence": 1,
       "Steps": [
+        {
+          "DataId": 1001263,
+          "Position": {
+            "X": 181.41443,
+            "Y": -2.3519497,
+            "Z": -240.40594
+          },
+          "TerritoryId": 133,
+          "InteractionType": "Interact",
+          "TargetTerritoryId": 152,
+          "AethernetShortcut": [
+            "[Gridania] Conjurers' Guild",
+            "[Gridania] Lancers' Guild"
+          ],
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "East Shroud - Hawthorne Hut",
+              "InTerritory": [
+                152
+              ]
+            }
+          }
+        },
+        {
+          "TerritoryId": 152,
+          "InteractionType": "AttuneAetheryte",
+          "Aetheryte": "East Shroud - Hawthorne Hut",
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "East Shroud - Hawthorne Hut"
+            }
+          }
+        },
         {
           "Position": {
             "X": -276.804,
@@ -42,7 +75,12 @@
           "TerritoryId": 152,
           "InteractionType": "WalkTo",
           "AetheryteShortcut": "East Shroud - Hawthorne Hut",
-          "Fly": true
+          "Fly": true,
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "AetheryteLocked": "East Shroud - Hawthorne Hut"
+            }
+          }
         },
         {
           "DataId": 2000889,
@@ -212,6 +250,9 @@
           },
           "TerritoryId": 152,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "Fly": true
         }
       ]

QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/129_Spirithold Broken.json

@@ -138,7 +138,10 @@
             "Z": 192.2179
           },
           "TerritoryId": 148,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/161_Leia's Legacy.json

@@ -111,7 +111,13 @@
             "Z": 295.52136
           },
           "TerritoryId": 148,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "Notes": [
+              "Healer NPC is only killed after the boss dies; all NPCs need to be killed for the duty to complete"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/445_Chasing Shadows.json

@@ -29,10 +29,12 @@
           },
           "TerritoryId": 148,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": false,
+          "SinglePlayerDutyOptions": {
-          "BossModNotes": [
+            "Enabled": false,
-            "AI doesn't automatically target newly spawning adds and dies until after the boss died (tested on CNJ)"
+            "Notes": [
-          ]
+              "AI doesn't automatically target newly spawning adds until after the boss died, and dies (tested on CNJ)"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Gridania/447_To Guard a Guardian.json

@@ -77,6 +77,12 @@
           },
           "TerritoryId": 148,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "Notes": [
+              "(Phase 1) Healer NPCs are only killed after the boss dies - allied NPCs will kill them eventually; all NPCs need to be killed for the duty to complete"
+            ]
+          },
           "AetheryteShortcut": "Central Shroud - Bentbranch Meadows"
         }
       ]

QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/414_Victory in Peril.json

@@ -69,6 +69,12 @@
           },
           "TerritoryId": 135,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "Notes": [
+              "(Phase 1, second enemy group) Stuck with enemy being out of sight -- but still able to attack you (tested on ACN)"
+            ]
+          },
           "AetheryteShortcut": "Lower La Noscea - Moraby Drydocks"
         }
       ]

QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/466_Double Dealing.json

@@ -45,8 +45,11 @@
           "TerritoryId": 134,
           "InteractionType": "Combat",
           "EnemySpawnType": "AutoOnEnterArea",
-          "KillEnemyDataIds": [
+          "ComplexCombatData": [
-            52
+            {
+              "DataId": 52,
+              "IgnoreQuestMarker": true
+            }
           ]
         },
         {

QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/469_Just Deserts.json

@@ -73,7 +73,10 @@
             "Z": -432.15082
           },
           "TerritoryId": 134,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/543_Lurkers in the Grotto.json

@@ -28,7 +28,13 @@
             "Z": -141.7716
           },
           "TerritoryId": 134,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": false,
+            "Notes": [
+              "AI doesn't automatically target newly spawning adds until after the boss died (requires healing luck on ACN)"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Limsa/544_Feint and Strike.json

@@ -58,6 +58,12 @@
           },
           "TerritoryId": 138,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "Notes": [
+              "(Phase 1) Kills PGL NPCs and then the boss - allied NPCs will kill most other NPCs eventually; all NPCs need to be killed for the duty to complete"
+            ]
+          },
           "AetheryteShortcut": "Western La Noscea - Swiftperch"
         }
       ]

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/343_Lord of the Inferno.json

@@ -44,7 +44,10 @@
             "Z": -242.51166
           },
           "TerritoryId": 145,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/660_Into a Copper Hell.json

@@ -79,6 +79,9 @@
           },
           "TerritoryId": 130,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "AetheryteShortcut": "Ul'dah",
           "AethernetShortcut": [
             "[Ul'dah] Aetheryte Plaza",
@@ -87,6 +90,9 @@
         }
       ]
     },
+    {
+      "Sequence": 5
+    },
     {
       "Sequence": 255,
       "Steps": [

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/680_The Company You Keep (Twin Adders).json

@@ -63,12 +63,22 @@
           "AethernetShortcut": [
             "[Gridania] Aetheryte Plaza",
             "[Gridania] Lancers' Guild"
-          ]
+          ],
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "East Shroud - Hawthorne Hut"
+            }
+          }
         },
         {
           "TerritoryId": 152,
           "InteractionType": "AttuneAetheryte",
-          "Aetheryte": "East Shroud - Hawthorne Hut"
+          "Aetheryte": "East Shroud - Hawthorne Hut",
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "East Shroud - Hawthorne Hut"
+            }
+          }
         },
         {
           "DataId": 1004886,
@@ -78,7 +88,16 @@
             "Z": 475.30322
           },
           "TerritoryId": 152,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/681_The Company You Keep (Maelstrom).json

@@ -64,6 +64,9 @@
           },
           "TerritoryId": 135,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "AethernetShortcut": [
             "[Limsa Lominsa] The Aftcastle",
             "[Limsa Lominsa] Tempest Gate (Lower La Noscea)"

QuestPaths/2.x - A Realm Reborn/MSQ-1/Shared/682_The Company You Keep (Immortal Flames).json

@@ -59,6 +59,9 @@
           },
           "TerritoryId": 140,
           "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          },
           "AetheryteShortcut": "Western Thanalan - Horizon"
         }
       ]

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/303_Step Nine.json

@@ -46,7 +46,8 @@
           },
           "StopDistance": 7,
           "TerritoryId": 141,
-          "InteractionType": "Interact"
+          "InteractionType": "Interact",
+          "DelaySecondsAtStart": 2
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/320_Way Down in the Hole.json

@@ -158,7 +158,10 @@
             "Z": 117.29602
           },
           "TerritoryId": 141,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/334_Storms on the Horizon.json

@@ -21,6 +21,15 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": -174.73444,
+            "Y": 15.450659,
+            "Z": -266.76144
+          },
+          "TerritoryId": 140,
+          "InteractionType": "WalkTo"
+        },
         {
           "Position": {
             "X": -289.1099,

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/336_Oh Captain, My Captain.json

@@ -37,7 +37,10 @@
             "Z": -293.1411
           },
           "TerritoryId": 140,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/3853_Heir Today, Gone Tomorrow.json

@@ -29,7 +29,7 @@
           },
           "TerritoryId": 141,
           "InteractionType": "Combat",
-          "EnemySpawnType": "OverworldEnemies",
+          "EnemySpawnType": "FinishCombatIfAny",
           "KillEnemyDataIds": [
             352,
             353
@@ -53,6 +53,25 @@
     {
       "Sequence": 255,
       "Steps": [
+        {
+          "Position": {
+            "X": 131.78122,
+            "Y": 20.119337,
+            "Z": -115.27284
+          },
+          "TerritoryId": 141,
+          "InteractionType": "WalkTo"
+        },
+        {
+          "Position": {
+            "X": 127.7017,
+            "Y": -0.15994573,
+            "Z": -161.89238
+          },
+          "TerritoryId": 141,
+          "InteractionType": "WalkTo",
+          "DisableNavmesh": true
+        },
         {
           "DataId": 1001605,
           "Position": {

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/550_Underneath the Sultantree.json

@@ -28,7 +28,10 @@
             "Z": 536.88855
           },
           "TerritoryId": 141,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-1/Ul'dah/551_Duty, Honor, Country.json

@@ -64,7 +64,13 @@
             "Z": -131.48706
           },
           "TerritoryId": 141,
-          "InteractionType": "Interact",
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "Notes": [
+              "(Phase 1) Healer NPCs are only killed after the boss dies - allied NPCs will kill them eventually; all NPCs need to be killed for the duty to complete"
+            ]
+          },
           "AetheryteShortcut": "Central Thanalan - Black Brush Station"
         }
       ]

QuestPaths/2.x - A Realm Reborn/MSQ-2/A0-Gridania to East Shroud/3856_We Come in Peace.json

@@ -73,13 +73,23 @@
           },
           "TerritoryId": 133,
           "InteractionType": "Interact",
-          "TargetTerritoryId": 152
+          "TargetTerritoryId": 152,
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "East Shroud - Hawthorne Hut"
+            }
+          }
         },
         {
           "TerritoryId": 152,
           "InteractionType": "AttuneAetheryte",
           "Aetheryte": "East Shroud - Hawthorne Hut",
-          "StopDistance": 5
+          "StopDistance": 5,
+          "SkipConditions": {
+            "StepIf": {
+              "AetheryteUnlocked": "East Shroud - Hawthorne Hut"
+            }
+          }
         },
         {
           "DataId": 1006188,
@@ -89,7 +99,13 @@
             "Z": 283.4973
           },
           "TerritoryId": 152,
-          "InteractionType": "CompleteQuest"
+          "InteractionType": "CompleteQuest",
+          "AetheryteShortcut": "East Shroud - Hawthorne Hut",
+          "SkipConditions": {
+            "AetheryteShortcutIf": {
+              "InSameTerritory": true
+            }
+          }
         }
       ]
     }

QuestPaths/2.x - A Realm Reborn/MSQ-2/A2-East Shroud to South Shroud/724_Brotherly Love.json

@@ -64,7 +64,10 @@
             "Z": -39.383606
           },
           "TerritoryId": 152,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/A3-South Shroud, Buscarron’s Druthers/3862_Nouveau Riche.json

@@ -83,7 +83,13 @@
             "Z": -12.985474
           },
           "TerritoryId": 153,
-          "InteractionType": "SinglePlayerDuty"
+          "InteractionType": "SinglePlayerDuty",
+          "SinglePlayerDutyOptions": {
+            "Enabled": true,
+            "Notes": [
+              "AI will kill initial adds before the boss, but not switch target whenever new enemies spawn; all NPCs need to be killed for the duty to complete"
+            ]
+          }
         }
       ]
     },

QuestPaths/2.x - A Realm Reborn/MSQ-2/C9-Ultimate Weapon/4522_The Ultimate Weapon.json

@@ -104,10 +104,9 @@
           },
           "TerritoryId": 1053,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": false,
+          "SinglePlayerDutyOptions": {
-          "BossModNotes": [
+            "Enabled": true
-            "Doesn't handle death properly"
+          }
-          ]
         }
       ]
     },

QuestPaths/3.x - Heavensward/Class Quests/WAR/601_And My Axe.json

@@ -96,7 +96,9 @@
           "TerritoryId": 138,
           "InteractionType": "SinglePlayerDuty",
           "Fly": true,
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1595_A Series of Unfortunate Events.json

@@ -59,7 +59,9 @@
           },
           "TerritoryId": 401,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A1-Coerthas Western Highlands 1, Sea of Clouds 1/1597_Divine Intervention.json

@@ -79,7 +79,9 @@
             "[Ishgard] The Forgotten Knight",
             "[Ishgard] The Tribunal"
           ],
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A2-Raubahn/1601_Keeping the Flame Alive.json

@@ -29,7 +29,9 @@
           },
           "TerritoryId": 145,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A3.1-Coerthas Western Highlands 2/1606_Sounding Out the Amphitheatre.json

@@ -79,7 +79,9 @@
           "TerritoryId": 397,
           "InteractionType": "SinglePlayerDuty",
           "DisableNavmesh": true,
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A4-Ishgard/1639_Fire and Blood.json

@@ -75,7 +75,9 @@
           },
           "TerritoryId": 418,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A5-Sea of Clouds/1644_Familiar Faces.json

@@ -57,7 +57,9 @@
           "InteractionType": "SinglePlayerDuty",
           "Emote": "lookout",
           "StopDistance": 0.25,
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A6-The Dravanian Hinterlands/1657_An Illuminati Incident.json

@@ -48,7 +48,9 @@
             "[Idyllshire] Aetheryte Plaza",
             "[Idyllshire] Epilogue Gate (Eastern Hinterlands)"
           ],
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/3.x - Heavensward/MSQ/A7-Azys Lla/1667_Close Encounters of the VIth Kind.json

@@ -69,7 +69,9 @@
           },
           "TerritoryId": 402,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": true
+          "SinglePlayerDutyOptions": {
+            "Enabled": true
+          }
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json

@@ -85,14 +85,16 @@
           "TerritoryId": 351,
           "InteractionType": "SinglePlayerDuty",
           "Comment": "Estinien vs. Arch Ultima",
-          "BossModEnabled": false,
+          "SinglePlayerDutyOptions": {
-          "BossModNotes": [
+            "Enabled": false,
-            "AI doesn't move automatically for the first boss",
+            "Notes": [
-            "AI doesn't move automatically for the dialogue with gaius on the bridge",
+              "AI doesn't move automatically for the first boss",
-            "After walking downstairs automatically, AI tries to run back towards the stairs (ignoring the arena boudnary)",
+              "AI doesn't move automatically for the dialogue with gaius on the bridge",
-            "After moving from the arena boundary, AI doesn't move into melee range and stops too far away when initially attacking"
+              "After walking downstairs automatically, AI tries to run back towards the stairs (ignoring the arena boudnary)",
-          ],
+              "After moving from the arena boundary, AI doesn't move into melee range and stops too far away when initially attacking"
-          "$.1": "This doesn't have a duty confirmation dialog, so we're treating TEXT_LUCKMG110_03682_Q1_100_125 as one"
+            ]
+          },
+          "$": "This doesn't have a duty confirmation dialog, so we're treating TEXT_LUCKMG110_03682_Q1_100_125 as one"
         }
       ]
     },

QuestPaths/5.x - Shadowbringers/MSQ/H-5.2/3765_A Sleep Disturbed.json

@@ -46,10 +46,12 @@
           },
           "TerritoryId": 817,
           "InteractionType": "SinglePlayerDuty",
-          "BossModEnabled": false,
+          "SinglePlayerDutyOptions": {
-          "BossModNotes": [
+            "Enabled": false,
-            "Doesn't walk to the teleporter to finish the duty"
+            "Notes": [
-          ],
+              "Doesn't walk to the teleporter to finish the duty"
+            ]
+          },
           "Fly": true,
           "Comment": "A Sleep Disturbed (Opo-Opo, Wolf, Serpent)",
           "$": "The dialogue choices and data ids here are recycled",

QuestPaths/5.x - Shadowbringers/Trial Quests/3895_Sleep Now in Sapphire.json

@@ -104,7 +104,9 @@
           "StopDistance": 5,
           "TerritoryId": 829,
           "InteractionType": "SinglePlayerDuty",
-          "SinglePlayerDutyIndex": 1,
+          "SinglePlayerDutyOptions": {
+            "Index": 1
+          },
           "DialogueChoices": [
             {
               "Type": "List",

QuestPaths/quest-v1.json

@@ -1267,20 +1267,32 @@
           },
           "then": {
             "properties": {
-              "BossModEnabled": {
+              "SinglePlayerDutyOptions": {
-                "type": "boolean"
+                "type": "object",
-              },
+                "properties": {
-              "BossModNotes": {
+                  "Enabled": {
-                "type": "array",
+                    "type": "boolean"
-                "items": {
+                  },
-                  "type": "string"
+                  "Notes": {
-                }
+                    "type": "array",
-              },
+                    "items": {
-              "SinglePlayerDutyIndex": {
+                      "type": "string"
-                "type": "integer",
+                    }
-                "minimum": 0,
+                  },
-                "maximum": 1,
+                  "Index": {
-                "description": "If a quest has multiple solo instances (which affects 5 quests total), indicates which one this is"
+                    "type": "integer",
+                    "minimum": 0,
+                    "maximum": 1,
+                    "description": "If a quest has multiple solo instances (which affects 5 quests total), indicates which one this is"
+                  },
+                  "$": {
+                    "type": "string"
+                  }
+                },
+                "TODO_required": [
+                  "Enabled"
+                ],
+                "additionalProperties": false
               }
             }
           }

Questionable.Model/Questing/QuestStep.cs

@@ -75,9 +75,8 @@ public sealed class QuestStep
     public JumpDestination? JumpDestination { get; set; }
     public uint? ContentFinderConditionId { get; set; }
     public bool AutoDutyEnabled { get; set; }
-    public bool BossModEnabled { get; set; }
+    public SinglePlayerDutyOptions? SinglePlayerDutyOptions { get; set; }
-    public List<string> BossModNotes { get; set; } = [];
+    public byte SinglePlayerDutyIndex => SinglePlayerDutyOptions?.Index ?? 0;
-    public byte SinglePlayerDutyIndex { get; set; }
     public SkipConditions? SkipConditions { get; set; }
 
     public List<List<QuestWorkValue>?> RequiredQuestVariables { get; set; } = new();

Questionable.Model/Questing/SinglePlayerDutyOptions.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Questionable.Model.Questing;
+
+public sealed class SinglePlayerDutyOptions
+{
+    public bool Enabled { get; set; }
+    public List<string> Notes { get; set; } = [];
+    public byte Index { get; set; }
+}

Questionable/Controller/GameUi/InteractionUiController.cs

@@ -691,7 +691,7 @@ internal sealed class InteractionUiController : IDisposable
     private bool CheckSinglePlayerDutyYesNo(ElementId questId, QuestStep? step)
     {
         if (step is { InteractionType: EInteractionType.SinglePlayerDuty } &&
-            _bossModIpc.IsConfiguredToRunSoloInstance(questId, step.SinglePlayerDutyIndex, step.BossModEnabled))
+            _bossModIpc.IsConfiguredToRunSoloInstance(questId, step.SinglePlayerDutyOptions))
         {
             // Most of these are yes/no dialogs "Duty calls, ...".
             //

Questionable/Controller/QuestController.cs

@@ -10,6 +10,7 @@ using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
 using Microsoft.Extensions.Logging;
 using Questionable.Controller.Steps;
+using Questionable.Controller.Steps.Interactions;
 using Questionable.Controller.Steps.Shared;
 using Questionable.External;
 using Questionable.Functions;
@@ -200,7 +201,13 @@ internal sealed class QuestController : MiniTaskController<QuestController>
 
         if (!_clientState.IsLoggedIn || _condition[ConditionFlag.Unconscious])
         {
-            if (!_taskQueue.AllTasksComplete)
+            if (_condition[ConditionFlag.Unconscious] &&
+                _condition[ConditionFlag.SufferingStatusAffliction63] &&
+                _clientState.TerritoryType == SinglePlayerDuty.LahabreaTerritoryId)
+            {
+                // ignore, we're in the lahabrea fight
+            }
+            else if (!_taskQueue.AllTasksComplete)
             {
                 Stop("HP = 0");
                 _movementController.Stop();

Questionable/Controller/Steps/Common/SendNotification.cs

@@ -27,7 +27,7 @@ internal static class SendNotification
                     new Task(step.InteractionType, step.ContentFinderConditionId.HasValue
                         ? territoryData.GetContentFinderCondition(step.ContentFinderConditionId.Value)?.Name
                         : step.Comment),
-                EInteractionType.SinglePlayerDuty when !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyIndex, step.BossModEnabled) =>
+                EInteractionType.SinglePlayerDuty when !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions) =>
                     new Task(step.InteractionType, quest.Info.Name),
                 _ => null,
             };

Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs

@@ -1,7 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using Dalamud.Game.ClientState.Conditions;
+using Dalamud.Game.ClientState.Objects;
+using Dalamud.Game.ClientState.Objects.Types;
 using Dalamud.Plugin.Services;
 using FFXIVClientStructs.FFXIV.Client.Game;
+using Questionable.Controller.Steps.Common;
 using Questionable.Controller.Steps.Shared;
 using Questionable.Data;
 using Questionable.External;
@@ -12,22 +17,34 @@ namespace Questionable.Controller.Steps.Interactions;
 
 internal static class SinglePlayerDuty
 {
+    public const int LahabreaTerritoryId = 1052;
+
     internal sealed class Factory(
         BossModIpc bossModIpc,
-        TerritoryData territoryData) : ITaskFactory
+        TerritoryData territoryData,
+        ICondition condition,
+        IClientState clientState) : ITaskFactory
     {
         public IEnumerable<ITask> CreateAllTasks(Quest quest, QuestSequence sequence, QuestStep step)
         {
             if (step.InteractionType != EInteractionType.SinglePlayerDuty)
                 yield break;
 
-            if (bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyIndex, step.BossModEnabled))
+            if (bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions))
             {
                 if (!territoryData.TryGetContentFinderConditionForSoloInstance(quest.Id, step.SinglePlayerDutyIndex, out var cfcData))
                     throw new TaskException("Failed to get content finder condition for solo instance");
 
                 yield return new StartSinglePlayerDuty(cfcData.ContentFinderConditionId);
                 yield return new EnableAi();
+                if (cfcData.TerritoryId == LahabreaTerritoryId)
+                {
+                    yield return new SetTarget(14643);
+                    yield return new WaitCondition.Task(() => condition[ConditionFlag.Unconscious] || clientState.TerritoryType != LahabreaTerritoryId, "Wait(death)");
+                    yield return new DisableAi();
+                    yield return new WaitCondition.Task(() => !condition[ConditionFlag.Unconscious] || clientState.TerritoryType != LahabreaTerritoryId, "Wait(resurrection)");
+                    yield return new EnableAi();
+                }
                 yield return new WaitSinglePlayerDuty(cfcData.ContentFinderConditionId);
                 yield return new DisableAi();
                 yield return new WaitAtEnd.WaitNextStepOrSequence();
@@ -113,4 +130,32 @@ internal static class SinglePlayerDuty
 
         public override bool ShouldInterruptOnDamage() => false;
     }
+
+    // TODO this should be handled in VBM
+    internal sealed record SetTarget(uint DataId) : ITask
+    {
+        public override string ToString() => $"SetTarget({DataId})";
+    }
+
+    internal sealed class SetTargetExecutor(
+        ITargetManager targetManager,
+        IObjectTable objectTable) : TaskExecutor<SetTarget>
+    {
+        protected override bool Start() => true;
+
+        public override ETaskResult Update()
+        {
+            if (targetManager.Target?.DataId == Task.DataId)
+                return ETaskResult.TaskComplete;
+
+            IGameObject? gameObject = objectTable.FirstOrDefault(x => x.DataId == Task.DataId);
+            if (gameObject == null)
+                return ETaskResult.StillRunning;
+
+            targetManager.Target = gameObject;
+            return ETaskResult.StillRunning;
+        }
+
+        public override bool ShouldInterruptOnDamage() => false;
+    }
 }

Questionable/Controller/Steps/Shared/WaitAtEnd.cs

@@ -54,7 +54,7 @@ internal static class WaitAtEnd
                     return [new WaitNextStepOrSequence()];
 
                 case EInteractionType.Duty when !autoDutyIpc.IsConfiguredToRunContent(step.ContentFinderConditionId, step.AutoDutyEnabled):
-                case EInteractionType.SinglePlayerDuty when !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyIndex, step.BossModEnabled):
+                case EInteractionType.SinglePlayerDuty when !bossModIpc.IsConfiguredToRunSoloInstance(quest.Id, step.SinglePlayerDutyOptions):
                     return [new EndAutomation()];
 
                 case EInteractionType.WalkTo:

Questionable/External/BossModIpc.cs

@@ -82,7 +82,7 @@ internal sealed class BossModIpc
         ClearPreset();
     }
 
-    public bool IsConfiguredToRunSoloInstance(ElementId questId, byte dutyIndex, bool enabledByDefault)
+    public bool IsConfiguredToRunSoloInstance(ElementId questId, SinglePlayerDutyOptions? dutyOptions)
     {
         if (!IsSupported())
             return false;
@@ -90,7 +90,8 @@ internal sealed class BossModIpc
         if (!_configuration.SinglePlayerDuties.RunSoloInstancesWithBossMod)
             return false;
 
-        if (!_territoryData.TryGetContentFinderConditionForSoloInstance(questId, dutyIndex, out var cfcData))
+        dutyOptions ??= new();
+        if (!_territoryData.TryGetContentFinderConditionForSoloInstance(questId, dutyOptions.Index, out var cfcData))
             return false;
 
         if (_configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Contains(cfcData.ContentFinderConditionId))
@@ -99,6 +100,6 @@ internal sealed class BossModIpc
         if (_configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Contains(cfcData.ContentFinderConditionId))
             return true;
 
-        return enabledByDefault;
+        return dutyOptions.Enabled;
     }
 }

Questionable/Functions/GameFunctions.cs

@@ -16,6 +16,7 @@ using FFXIVClientStructs.FFXIV.Component.GUI;
 using LLib.GameUI;
 using Lumina.Excel.Sheets;
 using Microsoft.Extensions.Logging;
+using Questionable.Controller.Steps.Interactions;
 using Questionable.Model;
 using Questionable.Model.Questing;
 using Action = Lumina.Excel.Sheets.Action;
@@ -427,6 +428,11 @@ internal sealed unsafe class GameFunctions
                 return true;
         }
 
+        if (_condition[ConditionFlag.Unconscious] &&
+            _condition[ConditionFlag.SufferingStatusAffliction63] &&
+            _clientState.TerritoryType == SinglePlayerDuty.LahabreaTerritoryId)
+            return false; // needed to process the tasks
+
         return _condition[ConditionFlag.Occupied] || _condition[ConditionFlag.Occupied30] ||
                _condition[ConditionFlag.Occupied33] || _condition[ConditionFlag.Occupied38] ||
                _condition[ConditionFlag.Occupied39] || _condition[ConditionFlag.OccupiedInEvent] ||

Questionable/QuestionablePlugin.cs

@@ -231,6 +231,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin
         serviceCollection
             .AddTaskExecutor<SinglePlayerDuty.WaitSinglePlayerDuty, SinglePlayerDuty.WaitSinglePlayerDutyExecutor>();
         serviceCollection.AddTaskExecutor<SinglePlayerDuty.DisableAi, SinglePlayerDuty.DisableAiExecutor>();
+        serviceCollection.AddTaskExecutor<SinglePlayerDuty.SetTarget, SinglePlayerDuty.SetTargetExecutor>();
 
         serviceCollection.AddTaskExecutor<WaitCondition.Task, WaitCondition.WaitConditionExecutor>();
         serviceCollection.AddTaskFactory<WaitAtEnd.Factory>();

Questionable/Windows/ConfigComponents/SinglePlayerDutyConfigComponent.cs

@@ -122,70 +122,24 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
         foreach (var (questId, index, cfcData) in _territoryData.GetAllQuestsWithQuestBattles())
         {
             IQuestInfo questInfo = _questData.GetQuestInfo(questId);
-            QuestStep questStep = new QuestStep
+            (bool enabled, SinglePlayerDutyOptions options) = FindDutyOptions(questId, index);
-            {
-                SinglePlayerDutyIndex = 0,
-                BossModEnabled = false,
-            };
-            bool enabled;
-            if (_questRegistry.TryGetQuest(questId, out var quest))
-            {
-                if (quest.Root.Disabled)
-                {
-                    _logger.LogDebug("Disabling quest battle for quest {QuestId}, quest is disabled", questId);
-                    enabled = false;
-                }
-                else
-                {
-                    var foundStep = quest.AllSteps().FirstOrDefault(x =>
-                        x.Step.InteractionType == EInteractionType.SinglePlayerDuty &&
-                        x.Step.SinglePlayerDutyIndex == index);
-                    if (foundStep == default)
-                    {
-                        _logger.LogWarning(
-                            "Disabling quest battle for quest {QuestId}, no battle with index {Index} found", questId,
-                            index);
-                        enabled = false;
-                    }
-                    else
-                    {
-                        questStep = foundStep.Step;
-                        enabled = true;
-                    }
-                }
-            }
-            else
-            {
-                _logger.LogDebug("Disabling quest battle for quest {QuestId}, unknown quest", questId);
-                enabled = false;
-            }
 
             string name = $"{FormatLevel(questInfo.Level)} {questInfo.Name}";
             if (!string.IsNullOrEmpty(cfcData.Name) && !questInfo.Name.EndsWith(cfcData.Name, StringComparison.Ordinal))
                 name += $" ({cfcData.Name})";
 
             if (questsWithMultipleBattles.Contains(questId))
-                name += $" (Part {questStep.SinglePlayerDutyIndex + 1})";
+                name += $" (Part {options.Index + 1})";
             else if (cfcData.ContentFinderConditionId is 674 or 691)
                 name += " (Melee/Phys. Ranged)";
 
-            var dutyInfo = new SinglePlayerDutyInfo(
+            var dutyInfo = new SinglePlayerDutyInfo(name, questInfo, cfcData, options, enabled);
-                cfcData.ContentFinderConditionId,
-                cfcData.TerritoryId,
-                name,
-                questInfo.Expansion,
-                questInfo.JournalGenre ?? uint.MaxValue,
-                questInfo.SortKey,
-                questStep.SinglePlayerDutyIndex,
-                enabled,
-                questStep.BossModEnabled,
-                questStep.BossModNotes);
 
-            if (cfcData.ContentFinderConditionId is 332 or 333 or 313 or 334)
+            if (dutyInfo.IsLimsaStart)
                 startingCityBattles[EAetheryteLocation.Limsa].Add(dutyInfo);
-            else if (cfcData.ContentFinderConditionId is 296 or 297 or 299 or 298)
+            else if (dutyInfo.IsGridaniaStart)
                 startingCityBattles[EAetheryteLocation.Gridania].Add(dutyInfo);
-            else if (cfcData.ContentFinderConditionId is 335 or 312 or 337 or 336)
+            else if (dutyInfo.IsUldahStart)
                 startingCityBattles[EAetheryteLocation.Uldah].Add(dutyInfo);
             else if (questInfo.IsMainScenarioQuest)
                 mainScenarioBattles.Add(dutyInfo);
@@ -196,7 +150,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
                 foreach (var roleClassJob in classJobs)
                     roleQuestBattles[roleClassJob].Add(dutyInfo);
             }
-            else if (dutyInfo.CfcId is 845 or 1016)
+            else if (dutyInfo.IsOtherRoleQuest)
                 otherRoleQuestBattles.Add(dutyInfo);
             else
                 otherBattles.Add(dutyInfo);
@@ -220,7 +174,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
                 x =>
                     x.Value
                         // level 10 quests use the same quest battle for [you started as this class] and [you picked this class up later]
-                        .DistinctBy(y => y.CfcId)
+                        .DistinctBy(y => y.ContentFinderConditionId)
                         .OrderBy(y => y.JournalGenreId)
                         .ThenBy(y => y.SortKey)
                         .ThenBy(y => y.Index)
@@ -242,6 +196,47 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
             .ToImmutableList();
     }
 
+    private (bool Enabled, SinglePlayerDutyOptions Options) FindDutyOptions(ElementId questId, byte index)
+    {
+        SinglePlayerDutyOptions options = new()
+        {
+            Index = 0,
+            Enabled = false,
+        };
+        if (_questRegistry.TryGetQuest(questId, out var quest))
+        {
+            if (quest.Root.Disabled)
+            {
+                _logger.LogDebug("Disabling quest battle for quest {QuestId}, quest is disabled", questId);
+                return (false, options);
+            }
+            else
+            {
+                var foundStep = quest.AllSteps()
+                    .Select(x => x.Step)
+                    .FirstOrDefault(x =>
+                        x.InteractionType == EInteractionType.SinglePlayerDuty &&
+                        x.SinglePlayerDutyIndex == index);
+                if (foundStep == null)
+                {
+                    _logger.LogWarning(
+                        "Disabling quest battle for quest {QuestId}, no battle with index {Index} found", questId,
+                        index);
+                    return (false, options);
+                }
+                else
+                {
+                    return (true, foundStep.SinglePlayerDutyOptions ?? options);
+                }
+            }
+        }
+        else
+        {
+            _logger.LogDebug("Disabling quest battle for quest {QuestId}, unknown quest", questId);
+            return (false, options);
+        }
+    }
+
     private string BuildJournalGenreLabel(uint journalGenreId)
     {
         var journalGenre = _dataManager.GetExcelSheet<JournalGenre>().GetRow(journalGenreId);
@@ -250,7 +245,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
         string genreName = journalGenre.Name.ExtractText();
         string categoryName = journalCategory.Name.ExtractText();
 
-        return $"{categoryName} {SeIconChar.ArrowRight.ToIconString()} {genreName}";
+        return $"{categoryName} \u203B {genreName}";
     }
 
     public override void DrawTab()
@@ -423,13 +418,13 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
             {
                 ImGui.TableNextRow();
 
-                string[] labels = dutyInfo.BossModEnabledByDefault
+                string[] labels = dutyInfo.EnabledByDefault
                     ? SupportedCfcOptions
                     : UnsupportedCfcOptions;
                 int value = 0;
-                if (Configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Contains(dutyInfo.CfcId))
+                if (Configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Contains(dutyInfo.ContentFinderConditionId))
                     value = 1;
-                if (Configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Contains(dutyInfo.CfcId))
+                if (Configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Contains(dutyInfo.ContentFinderConditionId))
                     value = 2;
 
                 if (ImGui.TableNextColumn())
@@ -445,7 +440,7 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
                             ImGui.TextUnformatted(dutyInfo.Name);
                             ImGui.Separator();
                             ImGui.BulletText($"TerritoryId: {dutyInfo.TerritoryId}");
-                            ImGui.BulletText($"ContentFinderConditionId: {dutyInfo.CfcId}");
+                            ImGui.BulletText($"ContentFinderConditionId: {dutyInfo.ContentFinderConditionId}");
                         }
                     }
 
@@ -457,11 +452,18 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
                     else if (dutyInfo.Notes.Count > 0)
                     {
                         using var color = new ImRaii.Color();
-                        color.Push(ImGuiCol.TextDisabled, ImGuiColors.DalamudYellow);
+                        if (!dutyInfo.EnabledByDefault)
+                            color.Push(ImGuiCol.TextDisabled, ImGuiColors.DalamudYellow);
+                        else
+                            color.Push(ImGuiCol.TextDisabled, ImGuiColors.ParsedBlue);
+
                         ImGui.SameLine();
                         using (ImRaii.PushFont(UiBuilder.IconFont))
                         {
-                            ImGui.TextDisabled(FontAwesomeIcon.ExclamationTriangle.ToIconString());
+                            if (!dutyInfo.EnabledByDefault)
+                                ImGui.TextDisabled(FontAwesomeIcon.ExclamationTriangle.ToIconString());
+                            else
+                                ImGui.TextDisabled(FontAwesomeIcon.InfoCircle.ToIconString());
                         }
 
                         if (ImGui.IsItemHovered())
@@ -478,19 +480,19 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
 
                 if (ImGui.TableNextColumn())
                 {
-                    using var _ = ImRaii.PushId($"##Duty{dutyInfo.CfcId}");
+                    using var _ = ImRaii.PushId($"##Duty{dutyInfo.ContentFinderConditionId}");
                     using (ImRaii.Disabled(!dutyInfo.Enabled))
                     {
                         ImGui.SetNextItemWidth(200);
                         if (ImGui.Combo(string.Empty, ref value, labels, labels.Length))
                         {
-                            Configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Remove(dutyInfo.CfcId);
+                            Configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Remove(dutyInfo.ContentFinderConditionId);
-                            Configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Remove(dutyInfo.CfcId);
+                            Configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Remove(dutyInfo.ContentFinderConditionId);
 
                             if (value == 1)
-                                Configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Add(dutyInfo.CfcId);
+                                Configuration.SinglePlayerDuties.WhitelistedSinglePlayerDutyCfcIds.Add(dutyInfo.ContentFinderConditionId);
                             else if (value == 2)
-                                Configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Add(dutyInfo.CfcId);
+                                Configuration.SinglePlayerDuties.BlacklistedSinglePlayerDutyCfcIds.Add(dutyInfo.ContentFinderConditionId);
 
                             Save();
                         }
@@ -519,14 +521,28 @@ internal sealed class SinglePlayerDutyConfigComponent : ConfigComponent
     }
 
     private sealed record SinglePlayerDutyInfo(
-        uint CfcId,
-        uint TerritoryId,
         string Name,
-        EExpansionVersion Expansion,
+        IQuestInfo QuestInfo,
-        uint JournalGenreId,
+        TerritoryData.ContentFinderConditionData ContentFinderConditionData,
-        ushort SortKey,
+        SinglePlayerDutyOptions Options,
-        byte Index,
+        bool Enabled)
-        bool Enabled,
+    {
-        bool BossModEnabledByDefault,
+        public EExpansionVersion Expansion => QuestInfo.Expansion;
-        List<string> Notes);
+        public uint JournalGenreId => QuestInfo.JournalGenre ?? uint.MaxValue;
+        public ushort SortKey => QuestInfo.SortKey;
+        public uint ContentFinderConditionId => ContentFinderConditionData.ContentFinderConditionId;
+        public uint TerritoryId => ContentFinderConditionData.TerritoryId;
+        public byte Index => Options.Index;
+        public bool EnabledByDefault => Options.Enabled;
+        public IReadOnlyList<string> Notes => Options.Notes;
+
+        public bool IsLimsaStart => ContentFinderConditionId is 332 or 333 or 313 or 334;
+        public bool IsGridaniaStart => ContentFinderConditionId is 296 or 297 or 299 or 298;
+        public bool IsUldahStart => ContentFinderConditionId is 335 or 312 or 337 or 336;
+
+        /// <summary>
+        /// 'Other' role quest is the post-EW/DT role quests.
+        /// </summary>
+        public bool IsOtherRoleQuest => ContentFinderConditionId is 845 or 1016;
+    }
 }