Quest battles

CHANGELOG.md

@@ -3,4 +3,5 @@
 - Fix quest priority auto removal -alydev
   - Fix index error -alydev
 - Add current quest state to troubleshoot message -alydev
-- ARR intersocietal quests -alydev
+- ARR intersocietal quests -alydev
+- Fix some solo duties targetting. - Kage

Directory.Build.targets

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup Condition="$(MSBuildProjectName) != 'GatheringPathRenderer'">
-        <Version>15.287.0.5</Version>
+        <Version>15.287.0.6</Version>
     </PropertyGroup>
 
     <PropertyGroup>

Questionable/Controller/Steps/Interactions/SinglePlayerDuty.cs

@@ -182,7 +182,7 @@ internal sealed class EnableAiExecutor
     {
         protected override bool Start()
         {
-            bossModIpc.SetPreset(Task.Passive ? BossModIpc.EPreset.Overworld : BossModIpc.EPreset.QuestBattle);
+            bossModIpc.SetPresetForSoloDuty(Task.Passive ? BossModIpc.EPreset.Overworld : BossModIpc.EPreset.QuestBattle);
             return true;
         }
 
@@ -202,7 +202,7 @@ internal sealed class SetPresetExecutor
     {
         protected override bool Start()
         {
-            bossModIpc.SetPreset(Task.Preset);
+            bossModIpc.SetPresetForSoloDuty(Task.Preset);
             return true;
         }
 
@@ -254,7 +254,7 @@ internal sealed class DisableAiExecutor
     {
         protected override bool Start()
         {
-            bossModIpc.ClearPreset();
+            bossModIpc.DisableSoloDutyPreset();
             return true;
         }
 

Questionable/External/BossModIpc.cs

@@ -38,6 +38,8 @@ public enum EPreset
     private readonly ICallGateSubscriber<string, string?> _getPreset = pluginInterface.GetIpcSubscriber<string, string?>($"{PluginName}.Presets.Get");
     private readonly ICallGateSubscriber<string, bool> _setPreset = pluginInterface.GetIpcSubscriber<string, bool>($"{PluginName}.Presets.SetActive");
 
+    private bool _soloDutyZoneConfigured;
+
     public bool IsSupported() => IpcInvoke.SafeFunc(() => _getPreset.HasFunction, false);
 
     public void SetPreset(EPreset preset)
@@ -50,6 +52,12 @@ public void SetPreset(EPreset preset)
         _setPreset.InvokeFunc(definition.Name);
     }
 
+    public void SetPresetForSoloDuty(EPreset preset)
+    {
+        ConfigureZoneForQuestBattle(true);
+        SetPreset(preset);
+    }
+
     public void ClearPreset()
     {
         string? activePreset = _getActivePreset.InvokeFunc();
@@ -66,12 +74,40 @@ public void ClearPreset()
         }
     }
 
+    public void DisableSoloDutyPreset()
+    {
+        ReleaseSoloDutyZone();
+        ClearPreset();
+    }
+
     public void Cleanup()
     {
         commandManager.ProcessCommand("/vbmai off");
+        ReleaseSoloDutyZone();
         ClearPreset();
     }
 
+    private void ConfigureZoneForQuestBattle(bool enable)
+    {
+        commandManager.ProcessCommand(enable
+            ? "/vbm cfg ZoneModuleConfig EnableQuestBattles true"
+            : "/vbm cfg ZoneModuleConfig EnableQuestBattles false");
+        if (enable)
+        {
+            commandManager.ProcessCommand("/vbm cfg Autorotation ClearPresetOnCombatEnd false");
+            _soloDutyZoneConfigured = true;
+        }
+    }
+
+    private void ReleaseSoloDutyZone()
+    {
+        if (!_soloDutyZoneConfigured)
+            return;
+
+        commandManager.ProcessCommand("/vbm cfg ZoneModuleConfig EnableQuestBattles false");
+        _soloDutyZoneConfigured = false;
+    }
+
     public bool IsConfiguredToRunSoloInstance(ElementId questId, SinglePlayerDutyOptions? dutyOptions)
     {
         if (!IsSupported())