Split 'ManualAction' into different contextual elements
authorLiza Carvelli <liza@carvel.li>
Fri, 31 May 2024 23:49:11 +0000 (01:49 +0200)
committerLiza Carvelli <liza@carvel.li>
Fri, 31 May 2024 23:49:11 +0000 (01:49 +0200)
69 files changed:
Questionable/Controller/QuestController.cs
Questionable/Model/V1/Converter/EnemySpawnTypeConverter.cs
Questionable/Model/V1/Converter/InteractionTypeConverter.cs
Questionable/Model/V1/EEnemySpawnType.cs
Questionable/Model/V1/EInteractionType.cs
Questionable/QuestPaths/Endwalker/AetherCurrents/Elpis/4288_You and the Ailouros.json
Questionable/QuestPaths/Endwalker/AetherCurrents/Garlemald/4232_Children Are Our Future.json
Questionable/QuestPaths/Endwalker/AetherCurrents/Mare Lamentorum/4240_True Carrot Crimes.json
Questionable/QuestPaths/Endwalker/AetherCurrents/Mare Lamentorum/4241_Carrots Its Whats for Dinner.json
Questionable/QuestPaths/Endwalker/AetherCurrents/Ultima Thule/4342_Ending as One.json
Questionable/QuestPaths/Endwalker/AetherCurrents/Ultima Thule/4354_Combat Evolved.json
Questionable/QuestPaths/Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4361_A Labyrinthine Descent.json
Questionable/QuestPaths/Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4363_Deeper into the Maze.json
Questionable/QuestPaths/Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4370_A Fishermans Friend.json
Questionable/QuestPaths/Endwalker/MSQ/A-Thavnair1-Labyrinthos1/4377_In the Dark of the Tower.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4383_A Frosty Reception.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4384_Tracks in the Snow.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4385_How the Mighty Are Fallen.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4387_A Way Forward.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4393_Strange Bedfellows.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4394_In from the Cold.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4395_Gateway of the Gods.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4397_Sea of Sorrow.json
Questionable/QuestPaths/Endwalker/MSQ/B-Garlemald/4398_The Martyr.json
Questionable/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4405_Back to Old Tricks.json
Questionable/QuestPaths/Endwalker/MSQ/C-MareLamentorum/4406_Settiing Things Straight.json
Questionable/QuestPaths/Endwalker/MSQ/D-Thavnair2/4409_Skies Aflame.json
Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4419_Return to the Crystarium.json
Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4421_Petalouda Hunt.json
Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4426_Aether to Aether.json
Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4430_A Past Not Yet Come to Pass.json
Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4432_Worthy of His Back.json
Questionable/QuestPaths/Endwalker/MSQ/E-Elpis/4437_Caging the Messenger.json
Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4439_As the Heavens Burn.json
Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4443_Wise Guides.json
Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4447_Once Forged.json
Questionable/QuestPaths/Endwalker/MSQ/F-Labyrinthos2/4449_Her Children One and All.json
Questionable/QuestPaths/Endwalker/MSQ/G-UltimaThule/4450_A Bold Decision.json
Questionable/QuestPaths/Endwalker/MSQ/G-UltimaThule/4460_x.json
Questionable/QuestPaths/Endwalker/MSQ/G-UltimaThule/4461_Hello World.json
Questionable/QuestPaths/Endwalker/MSQ/G-UltimaThule/4464_Endwalker.json
Questionable/QuestPaths/Endwalker/MSQ/H-6.1/4527_Bountiful Ruins.json
Questionable/QuestPaths/Endwalker/MSQ/H-6.1/4529_Alzadaals Legacy.json
Questionable/QuestPaths/Endwalker/MSQ/I-6.2/4592_In Search of Azdaja.json
Questionable/QuestPaths/Endwalker/MSQ/I-6.2/4594_Where Everything Begins.json
Questionable/QuestPaths/Endwalker/MSQ/I-6.2/4597_The Wind Rises.json
Questionable/QuestPaths/Endwalker/MSQ/J-6.3/4672_Kindled Spirit.json
Questionable/QuestPaths/Endwalker/MSQ/J-6.3/4673_An Unforeseen Bargain.json
Questionable/QuestPaths/Endwalker/MSQ/J-6.3/4674_King of the Mountain.json
Questionable/QuestPaths/Endwalker/MSQ/J-6.3/4677_Desires Untold.json
Questionable/QuestPaths/Endwalker/MSQ/K-6.4/4736_Going Haam.json
Questionable/QuestPaths/Endwalker/MSQ/K-6.4/4742_Abyssal Dark.json
Questionable/QuestPaths/Endwalker/MSQ/L-6.5/4746_In Defiance of Fate.json
Questionable/QuestPaths/Endwalker/MSQ/L-6.5/4748_Down in the Dark.json
Questionable/QuestPaths/Endwalker/MSQ/M-6.55/4752_The Game Is Afoot.json
Questionable/QuestPaths/Shadowbringers/MSQ/F-Tempest/3654_Shadowbringers.json
Questionable/QuestPaths/Shadowbringers/MSQ/G-5.1/3674_A Grand Adventure.json
Questionable/QuestPaths/Shadowbringers/MSQ/G-5.1/3680_Finding Good Help.json
Questionable/QuestPaths/Shadowbringers/MSQ/G-5.1/3682_Vows of Virtue, Deeds of Cruelty.json
Questionable/QuestPaths/Shadowbringers/MSQ/H-5.2/3765_A Sleep Disturbed.json
Questionable/QuestPaths/Shadowbringers/MSQ/H-5.2/3769_Beneath the Surface.json
Questionable/QuestPaths/Shadowbringers/MSQ/I-5.3/3775_Faded Memories.json
Questionable/QuestPaths/Shadowbringers/MSQ/I-5.3/3777_The Converging Light.json
Questionable/QuestPaths/Shadowbringers/MSQ/I-5.3/3778_Hope's Confluence.json
Questionable/QuestPaths/Shadowbringers/MSQ/J-5.4/4011_Like Master, Like Pupil.json
Questionable/QuestPaths/Shadowbringers/MSQ/J-5.4/4015_The Great Ship Vylbrand.json
Questionable/QuestPaths/Shadowbringers/MSQ/K-5.5/4062_The Flames of War.json
Questionable/QuestPaths/Shadowbringers/MSQ/L-5.55/4066_Death Unto Dawn.json
Questionable/QuestSchema/schema_v1.json

index fc97bc804e2b42e66728656544282d4783b86e6f..f1f804800cd56a5972c17e33c9ba664649a203b0 100644 (file)
@@ -347,7 +347,8 @@ internal sealed class QuestController
                         };
                     }
                     else
-                        _movementController.NavigateTo(EMovementType.Quest, (uint)from, _aetheryteData.Locations[from], false,
+                        _movementController.NavigateTo(EMovementType.Quest, (uint)from, _aetheryteData.Locations[from],
+                            false,
                             AetheryteConverter.IsLargeAetheryte(from) ? 10.9f : 6.9f);
 
                     return;
@@ -576,6 +577,27 @@ internal sealed class QuestController
                 IncreaseStepCount();
                 break;
 
+            case EInteractionType.WaitForManualProgress:
+                // something needs to be done manually, the next sequence will be picked up automatically
+                break;
+
+            case EInteractionType.Duty:
+                // TODO open duty finder
+                break;
+
+            case EInteractionType.SinglePlayerDuty:
+                // TODO: Disable YesAlready, interact with NPC to open dialog, restore YesAlready
+                // TODO: also implement check for territory blacklist
+                break;
+
+            case EInteractionType.Jump:
+                // TODO implement somehow??
+                break;
+
+            case EInteractionType.Instruction:
+                // Need to manually forward
+                break;
+
             default:
                 _pluginLog.Warning($"Action '{step.InteractionType}' is not implemented");
                 break;
index a19b97b98da728950103bab523fe8178b337f5d4..5c5de532e050c24f264390d42f12e6dfd532c9b7 100644 (file)
@@ -9,5 +9,6 @@ public sealed class EnemySpawnTypeConverter() : EnumConverter<EEnemySpawnType>(V
         { EEnemySpawnType.AfterInteraction, "AfterInteraction" },
         { EEnemySpawnType.AfterItemUse, "AfterItemUse" },
         { EEnemySpawnType.AutoOnEnterArea, "AutoOnEnterArea" },
+        { EEnemySpawnType.OverworldEnemies, "OverworldEnemies" },
     };
 }
index 0778b86b3c61c1a5543d19b88d548c0e9b0652bb..c5aa932c9105d766318b96da9cf886cee390da54 100644 (file)
@@ -16,6 +16,10 @@ public sealed class InteractionTypeConverter() : EnumConverter<EInteractionType>
         { EInteractionType.Say, "Say" },
         { EInteractionType.Emote, "Emote" },
         { EInteractionType.WaitForObjectAtPosition, "WaitForNpcAtPosition" },
-        { EInteractionType.ManualAction, "ManualAction" }
+        { EInteractionType.WaitForManualProgress, "WaitForManualProgress" },
+        { EInteractionType.Duty, "Duty" },
+        { EInteractionType.SinglePlayerDuty, "SinglePlayerDuty" },
+        { EInteractionType.Jump, "ShouldBeAJump" },
+        { EInteractionType.Instruction, "Instruction" },
     };
 }
index bc12720b11f3d24eb0e8fb7f18e93f3c62ee8be0..8465f0119b60de15c90b910d2fc1b78fce767bb4 100644 (file)
@@ -10,4 +10,5 @@ public enum EEnemySpawnType
     AfterInteraction,
     AfterItemUse,
     AutoOnEnterArea,
+    OverworldEnemies,
 }
index 5e03db43682d33949e4e2172fb870c85042e7dc8..9ee2a4557631fd60e9001a6fe86064ec2b4ed656 100644 (file)
@@ -16,5 +16,14 @@ public enum EInteractionType
     Say,
     Emote,
     WaitForObjectAtPosition,
-    ManualAction
+    WaitForManualProgress,
+    Duty,
+    SinglePlayerDuty,
+
+    Jump,
+
+    /// <summary>
+    /// Needs to be manually continued.
+    /// </summary>
+    Instruction,
 }
index a65d79bc618f5dc4282cc945a4433514a86741f2..57f31f082e65b0361e87448e13eef590d4e9fa4d 100644 (file)
@@ -28,7 +28,7 @@
             "Z": 509.72766
           },
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Follow"
         },
         {
index 52687bdab1cc0087a4486295b6aea8ef68d8311e..a1cae574cfad422b870440367afee8bf84ad8707 100644 (file)
@@ -43,7 +43,7 @@
             "Z": -668.9708
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Follow Azure-haired Boy"
         },
         {
index 3b475c42c5fe22d6210ecfbc73edfecb7c342e0d..c61cab8f9aec4179147080c02d33b9f900b9fe1c 100644 (file)
@@ -46,7 +46,7 @@
             "Z": -807.82135
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "Comment": "Navmesh can't jump (TODO this is super out of the way)"
         },
         {
index 1d647dd6835fa457e368e1bcdb6b8307e87639e8..d620cb1cd962cb62e0268058e71a67187f7ec19e 100644 (file)
@@ -27,7 +27,7 @@
             "Z": -646.97064
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "Comment": "Navmesh can't jump"
         },
         {
@@ -57,7 +57,7 @@
             "Z": -420.43494
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "Comment": "Navmesh can't jump"
         },
         {
index 537f9e4ed877b3d0480a32275b1860533f989af5..83d7f94c7833f6d416488aa60e352e855edeb425 100644 (file)
@@ -27,8 +27,9 @@
             "Z": -523.8633
           },
           "TerritoryId": 960,
-          "InteractionType": "ManualAction",
-          "Comment": "Kill 2 Drifting Ea",
+          "InteractionType": "Combat",
+          "EnemySpawnType": "OverworldEnemies",
+          "Comment": "Kill 2 Drifting Ea, TODO: add data ids",
           "$": "QuestVariables: 0 0-16-32 0 0 0 0"
         }
       ]
index 68b2a1629bc16c3d70114246584df5cd3ff22a79..563ff11cb799242619bf869080a04b7ecfa7a8d3 100644 (file)
@@ -28,7 +28,7 @@
           },
           "StopDistance": 0.5,
           "TerritoryId": 960,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "EnemySpawnType": "AutoOnEnterArea",
           "KillEnemyDataIds": [
             14044
index ac97e616ba83a85cf508c9fd77dccbd7eccbacbc..4e8a1be209fae144a4fd7288f5a9f5f93cf5fe94 100644 (file)
@@ -47,7 +47,7 @@
             "Z": -27.054321
           },
           "TerritoryId": 962,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Follow Alisaie"
         }
       ]
index 5d7676b532170d70703176345293bca15e2e722e..563f396139b6fca95458ba1945f8090079505d58 100644 (file)
             "Z": -519.18823
           },
           "TerritoryId": 956,
-          "InteractionType": "ManualAction",
+          "InteractionType": "SinglePlayerDuty",
           "Comment": "Duty - Shoot Large Green Bird"
         }
       ]
index 9301bbcf44e1c04c7f4a6b4bdd8c96e26da8353a..b3509be2e0a2bf06f7b46ed56b665a425b472c2f 100644 (file)
@@ -43,7 +43,7 @@
             "Z": 799.2217
           },
           "TerritoryId": 957,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (2, 2, 1)"
         }
       ]
@@ -59,7 +59,7 @@
             "Z": 681.7273
           },
           "TerritoryId": 957,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (2, 1, 2)"
         }
       ]
@@ -75,7 +75,7 @@
             "Z": 517.72327
           },
           "TerritoryId": 957,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (2, 2, 2)"
         }
       ]
index 843ea9becb9ae62726b3364e9fcd7b6c737949b6..234cbad90fb53dbd6a5c17c198c8214d9c488718 100644 (file)
@@ -60,8 +60,8 @@
             "Z": -663.81323
           },
           "TerritoryId": 957,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Tower of Zot"
+          "InteractionType": "Duty",
+          "Comment": "The Tower of Zot"
         }
       ]
     },
index b13f99aa20859b21b3293af0c8c4f3a29d938541..0e50c4fc8be128e508ec8eed5f304211b5639a3a 100644 (file)
@@ -31,8 +31,8 @@
             "Z": 539.6046
           },
           "TerritoryId": 621,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - A Frosty Reception"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "A Frosty Reception"
         }
       ]
     },
index ef9f3b5148997dbf6c919a65d6bef1022dc002e5..e301cb5e365396831d8bf9aa50356084578e927b 100644 (file)
             "Z": 390.46313
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Follow Girl in Green"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Follow Girl in Green"
         }
       ]
     },
index de2811fbb01e9aca56f48b96dbd60046ac51de76..f683e5265e20407c61596e965976193cf2044d92 100644 (file)
             "Z": 251.71986
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "DisableNavmesh": true,
           "Comment": "Jump on Pipeline and move near the Aether Current"
         },
index e3fcaedbbaafb2adc255250c9e3db17807db996b..f6fd793a2151a898c720887f8e9f6221e080dbc9 100644 (file)
@@ -77,7 +77,7 @@
             "Z": 365.7129
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Follow Alphinaud and Alisaie"
         }
       ]
index 1925c06a26673777af3c5600cfcedef501833246..5078202db4915685f85e75c31f912f80c4ce9038 100644 (file)
@@ -48,7 +48,7 @@
             "Z": -402.64487
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "Comment": "Jump to Aether Current"
         },
         {
@@ -69,7 +69,7 @@
             "Z": -398.82806
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "Comment": "Leave the Aether Current location"
         },
         {
@@ -79,7 +79,7 @@
             "Z": -337.21478
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "Comment": "Jump onto the Highway"
         },
         {
             "Z": 94.77368
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             14079
             "Z": 396.96338
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
             14080
index 3414fa1aec00979004935de63fab2dca3b387b94..ab772586822c0990b86293343b781e3f8dff3bc0 100644 (file)
@@ -28,8 +28,8 @@
             "Z": 488.3954
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
-          "Comment": "Start Duty"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "In from the Cold"
         }
       ]
     },
index f491288ff94a412546068e1dd168092b8fcb15fd..0307961d49f9a823fa68f26808f389e4036c10b3 100644 (file)
             "Z": -676.875
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Tower of Babil"
+          "InteractionType": "Duty",
+          "Comment": "The Tower of Babil"
         }
       ]
     },
index 071d807bd5bbb642c6280a169316c90479ab6c08..3a8be09ab1141c1766b369f9ceeaf9a3d724c687 100644 (file)
@@ -89,7 +89,7 @@
             "Z": 419.7605
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "Comment": "Follow Argos"
         },
         {
             "Z": 523.5217
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
+          "InteractionType": "Instruction",
           "Comment": "Follow Argos"
         },
         {
index 1c88a27f2b8038d84bdbd123866ec16e189acf8f..09aca30a56fc436384c723b1a854e6837b224ad7 100644 (file)
@@ -46,8 +46,8 @@
             "Z": 103.227295
           },
           "TerritoryId": 1028,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Zodiark"
+          "InteractionType": "Duty",
+          "Comment": "The Dark Inside"
         }
       ]
     },
index 6ee4f86742e35811ab2ff30fdf6d0b8cde73d49b..3ac64fda7d5cdf984cf8c03ec7ba1206c76bb1d9 100644 (file)
@@ -45,8 +45,8 @@
             "Z": -269.24548
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Follow Urianger"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Follow Urianger"
         }
       ]
     },
@@ -61,8 +61,8 @@
             "Z": -269.24548
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Follow Urianger (but you failed the first time)"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Follow Urianger (but you failed the first time)"
         }
       ]
     },
index 8dde87950c523f21c2da120ccf3b5c786cf43823..031fb3817af14ff4aec0979f50c96d874d182b2c 100644 (file)
             "Z": -558.8681
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
           "Comment": "Navmesh can't jump"
         },
             "Z": -654.13904
           },
           "TerritoryId": 959,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Find Runninway"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Find \"Runninway?\""
         }
       ]
     },
index a3dbe9ba69cc59e8d2a889a70550f4b06daaed8d..e903c04a1fdf0b80a0e25f5a7bcebe0723c16d3f 100644 (file)
@@ -70,8 +70,8 @@
             "Z": 761.50134
           },
           "TerritoryId": 957,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Vanaspati"
+          "InteractionType": "Duty",
+          "Comment": "Vanaspati"
         }
       ]
     },
index 1c5a6d7058152461778ad3693903bb9d9ec0a748..c7dfbc992a8bb1737743c1fc366104219fc31ed5 100644 (file)
@@ -50,7 +50,7 @@
             "Z": -210.52875
           },
           "TerritoryId": 819,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Cutscene Interaction needed",
           "AetheryteShortcut": "Crystarium",
           "AethernetShortcut": [
index 3782a480e1ea7a6b94ddb2665af093858bd5908f..080664c6ba2a520cbff98561db6695cde405c707 100644 (file)
@@ -39,7 +39,7 @@
         {
           "DataId": 1039998,
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Capture Mobs with less than 50% HP"
         }
       ]
index 4262112ac87d2c7e8945615a64d95a7170aa4a0a..d265bac388efa61df1008663f6feac473f8aca08 100644 (file)
@@ -37,7 +37,7 @@
             "Z": 543.8281
           },
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "Comment": "Jump on Ledge"
         },
         {
index be205917314a1c1e9bf2a14ab80882cbfe6cffd5..456d071673008735376dd825bd19babf78e0fe10 100644 (file)
@@ -84,7 +84,7 @@
             "Z": -173.75458
           },
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (1, 2, 1)"
         }
       ]
             "Z": -155.5047
           },
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (2, 2, 1)"
         }
       ]
index 05ebba34c141c1c881cb57e2e13d43bcbf5cf61c..e248c409d60179fb707dff506edbfaf887c203f0 100644 (file)
@@ -64,8 +64,8 @@
             "Z": 62.302612
           },
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Venat"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Venat"
         }
       ]
     },
index a9b5edd71ec066cab940253857e22b4d7204be8b..cf34ff892e9b70df243453f3d57b2b379a71bcf0 100644 (file)
@@ -48,8 +48,8 @@
           },
           "StopDistance": 4,
           "TerritoryId": 961,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Ktisis Hyperborea"
+          "InteractionType": "Duty",
+          "Comment": "Ktisis Hyperborea"
         }
       ]
     },
index 79b56e00f58196af338f229a7ba0b03154a46392..599486b7d7474becbbfd4d6f839c357679167ee4 100644 (file)
@@ -28,9 +28,9 @@
             "Z": 501.85388
           },
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
+          "InteractionType": "SinglePlayerDuty",
           "AetheryteShortcut": "Garlemald - Camp Broken Glass",
-          "Comment": "Duty - As the Heavens Burn"
+          "Comment": "As the Heavens Burn"
         }
       ]
     },
index f129fce7daba9365ad010b19785f479138da3683..e324c1cac0348d555ad9e6e305eb3cc9feb0d884 100644 (file)
@@ -45,7 +45,7 @@
           },
           "StopDistance": 5,
           "TerritoryId": 956,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Find Points of Interest"
         }
       ]
index 129aa1ff525abdbc257cc78c16fc5515175990d0..55f6c7b8778ff2b1dd2f4efe1b897d04318f5b3c 100644 (file)
@@ -99,7 +99,7 @@
             "Z": 681.35846
           },
           "TerritoryId": 956,
-          "InteractionType": "ManualAction",
+          "InteractionType": "ShouldBeAJump",
           "DisableNavmesh": true,
           "Comment": "Navmesh can't jump"
         },
index 53f10dbeb7679a27ad1220f289a9627b3e733fdd..169601d43512e5522e29015ced2bc930bfaca3e9 100644 (file)
@@ -43,8 +43,8 @@
             "Z": 341.29846
           },
           "TerritoryId": 956,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Aitiascope"
+          "InteractionType": "Duty",
+          "Comment": "Aitiascope"
         }
       ]
     },
index 0dbe3cf1126ca077db5962916bab6c78f1699633..2acee38e4385752422d90db1e3d6848ea8106dcc 100644 (file)
@@ -82,7 +82,7 @@
             "Z": -62.485718
           },
           "TerritoryId": 962,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (2, 2, 2, N/A, 2)"
         }
       ]
index cb9500ea54039b81d71b53b1bb4c3dda1599339b..5850815514fd29425fd35bd5a68283681bf06f1a 100644 (file)
@@ -96,7 +96,7 @@
             "Z": 375.50916
           },
           "TerritoryId": 960,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Duty - Find Errant Omicron"
         }
       ]
index 7fddef99b91e57c8e3bd7d02e9b51d09b6401adf..08595d02789740932d120ccbd0a4b218f78faf80 100644 (file)
@@ -44,7 +44,7 @@
             "Z": 398.42822
           },
           "TerritoryId": 960,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Identify Anomaly (Elbow/Knee)"
         }
       ]
index dc1a27d2875364549a91487a49bec4a62a20fb71..acf28e3ab5d0dad4795f42fe129167ea7c8023d4 100644 (file)
@@ -31,8 +31,8 @@
             "Z": -9.079163
           },
           "TerritoryId": 960,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Dead Ends"
+          "InteractionType": "Duty",
+          "Comment": "The Dead Ends"
         }
       ]
     },
@@ -48,8 +48,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 1029,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Final Day"
+          "InteractionType": "Duty",
+          "Comment": "The Final Day"
         }
       ]
     },
@@ -64,8 +64,8 @@
             "Z": 89.98242
           },
           "TerritoryId": 1026,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Zenos"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Zenos"
         }
       ]
     },
index bbcf8a31c5edcdaf99cf1fd1d77f80d2d16354e1..4d032d94626b78ea36ffbe9114568fc7cdfde8e5 100644 (file)
@@ -48,7 +48,7 @@
             "Z": -225.42157
           },
           "TerritoryId": 963,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Talk (1, 1, 1, 2)"
         }
       ]
index 0bffc6131298eb2f43a4add64d378bc2258da104..953db32dcc36995290ffc2e9fd31665c5f89daf6 100644 (file)
@@ -31,8 +31,8 @@
             "Z": 610.65076
           },
           "TerritoryId": 957,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Alzadaal's Legacy"
+          "InteractionType": "Duty",
+          "Comment": "Alzadaal's Legacy"
         }
       ]
     },
index e6de9ae3a9149623825a77da4310bc66f780df21..7fa88e01f08329b62d355a5545e7ecd0bdff3e4e 100644 (file)
@@ -75,8 +75,8 @@
             "Z": -89.463684
           },
           "TerritoryId": 1056,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Fell Court of Troia"
+          "InteractionType": "Duty",
+          "Comment": "Fell Court of Troia"
         }
       ]
     },
index c8d69ae195a2b902d7336b4fb9fc42c4318476d9..aa488d064b5d826a117624bafed7357beb9c4631 100644 (file)
@@ -69,8 +69,8 @@
             "Z": -150.83551
           },
           "TerritoryId": 1089,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Where Everything Begins"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Where Everything Begins"
         }
       ]
     },
index f9559ed479a256cd710c9a7638d00e29931e06be..8079e7eb833b222997bcb8fa94469bad0caf3670 100644 (file)
@@ -45,8 +45,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 1092,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Storm's Crown"
+          "InteractionType": "Duty",
+          "Comment": "Storm's Crown"
         }
       ]
     },
index fb9f9ddbb0ede6b37cfaf368a0f686c463e5fb4d..616e16023b4463fe60e168d17590bac74efd35ad 100644 (file)
@@ -47,7 +47,8 @@
           "InteractionType": "Combat",
           "EnemySpawnType": "AfterInteraction",
           "KillEnemyDataIds": [
-            16028, 16029
+            16028,
+            16029
           ],
           "$.0": "[1]",
           "$.1": "QuestVariables if done first: 16 5(enemy kill count) 0 0 0 64"
index d9c29025c222f7eb8d5be722bdb2cf2384a35146..a852f0a7363305295a0f9591a76c09cede944216 100644 (file)
@@ -29,8 +29,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 958,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - An Unforeseen Bargain"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "An Unforeseen Bargain"
         }
       ]
     },
index 7e71565c63f3dea136973138802db3a0f2bcf2e8..827a244529e722d6765038bd64091a39e3ca5931 100644 (file)
@@ -61,8 +61,8 @@
           },
           "TerritoryId": 958,
           "StopDistance": 5,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Lapis Manalis"
+          "InteractionType": "Duty",
+          "Comment": "Lapis Manalis"
         }
       ]
     },
index c98ba606ac06ef4da8562c695b774c2d3395a38b..f05b314c07a456922f5e2089dc58fe49287828c7 100644 (file)
@@ -58,8 +58,8 @@
             "Z": 45.63965
           },
           "TerritoryId": 1125,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Mount Ordeals"
+          "InteractionType": "Duty",
+          "Comment": "Mount Ordeals"
         }
       ]
     },
index 9e55b2b2cc28401418f0273e121b4a4272723aec..8b14d592e0ef1fa53f15b21285f9e1f33bc9060b 100644 (file)
             "Z": 238.0937
           },
           "TerritoryId": 962,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Aetherfont"
+          "InteractionType": "Duty",
+          "Comment": "The Aetherfont"
         }
       ]
     },
index 4e2186c7e608e7b67d7214f60dab1b5508c8c7a1..1ec272a4c0dffbf26cc8e9248fc336fba625100a 100644 (file)
@@ -43,8 +43,8 @@
             "Z": 101.823364
           },
           "TerritoryId": 1159,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Voidcast Dais"
+          "InteractionType": "Duty",
+          "Comment": "The Voidcast Dais"
         }
       ]
     },
index e57460605759729b16148eefe69b9a60f1b959af..facb0fdc1d48e956f8a903ec3b1a77b87fddfd31 100644 (file)
@@ -43,8 +43,8 @@
             "Z": 298.20703
           },
           "TerritoryId": 817,
-          "InteractionType": "ManualAction",
-          "Comment": "/say allin tuta"
+          "InteractionType": "Say",
+          "ChatMessage": "allin tuta"
         }
       ]
     },
index 77bc6a8f39e66b3aa98355d577a8a094f1e2002b..6a6e37e2990011e793a739e640850f682453d09e 100644 (file)
@@ -28,8 +28,8 @@
             "Z": 439.96326
           },
           "TerritoryId": 1162,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Lunar Subterrane"
+          "InteractionType": "Duty",
+          "Comment": "The Lunar Subterrane"
         }
       ]
     },
@@ -59,8 +59,8 @@
             "Z": 106.3549
           },
           "TerritoryId": 1181,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Abyssal Fracture"
+          "InteractionType": "Duty",
+          "Comment": "The Abyssal Fracture"
         }
       ]
     },
index 45fc2edb774e4946aea4e73035aefe5da70a66c3..5a4f23553a66aef31e34c8deb22b28be92bb98e3 100644 (file)
@@ -28,8 +28,8 @@
             "Z": 243.42712
           },
           "TerritoryId": 962,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Game Is Afoot",
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "The Game Is Afoot",
           "AethernetShortcut": [
             "[Old Sharlayan] The Studium",
             "[Old Sharlayan] Scholar's Harbor"
index 631ddd7ec6cdfba4b36ad3da82658651d1c76d68..aff07c45737fb8d9fe185b7da60d45a749e1f8f1 100644 (file)
@@ -15,8 +15,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 818,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Amaurot"
+          "InteractionType": "Duty",
+          "Comment": "Amaurot"
         }
       ]
     },
@@ -32,8 +32,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 881,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Dying Gasp"
+          "InteractionType": "Duty",
+          "Comment": "The Dying Gasp"
         }
       ]
     },
index 79c21e06c41c57fbf5dd9671fbb80936ad61f7b0..ec57c56e6f110ed66907aec1501c81d8827bf08a 100644 (file)
@@ -54,8 +54,8 @@
             "Z": 647.6997
           },
           "TerritoryId": 813,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Grand Cosmos"
+          "InteractionType": "Duty",
+          "Comment": "Grand Cosmos"
         }
       ]
     },
index 485853922fa4d4ca81792441df8b70011a180003..928906c37d2761e1de3e51ff5afd10e995d0eb17 100644 (file)
@@ -44,8 +44,8 @@
             "Z": -161.45575
           },
           "TerritoryId": 814,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Help Master Chai dodge enemies"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Help Master Chai dodge enemies"
         }
       ]
     },
index 0e428deb07fd4a32eeb745675911579da6a58d13..01c99d9763dad27210cca73a681ef4c8c6729453 100644 (file)
@@ -69,8 +69,8 @@
             "Z": -9.10968
           },
           "TerritoryId": 351,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Estinien vs. Arch Ultima"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Estinien vs. Arch Ultima"
         }
       ]
     },
index b29dbabc0c62402a0e8852b8f23b03806aa33e65..02e6902e515c15396e5322b670ac4e86f825d61f 100644 (file)
@@ -45,7 +45,7 @@
             "Z": -387.10614
           },
           "TerritoryId": 817,
-          "InteractionType": "ManualAction",
+          "InteractionType": "SinglePlayerDuty",
           "Fly": true,
           "Comment": "Duty - A Sleep Disturbed (Opo-Opo, Wolf, Serpent)"
         }
index c3c26085a174042ac168991c1efc0f5f45df10c0..4965aee3c051576a9366b5617f9d37355e23f8e3 100644 (file)
@@ -46,8 +46,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 814,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Anamnesis Anyder"
+          "InteractionType": "Duty",
+          "Comment": "Anamnesis Anyder"
         }
       ]
     }
index d37007031d130502f298a5782d5f0036196bc2a0..2f217bcb765bf0786b44403a6652f6de0d91daa7 100644 (file)
@@ -54,8 +54,8 @@
             "Z": -448.3325
           },
           "TerritoryId": 918,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Fight NPCs, then Elidibus"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Fight NPCs, then Elidibus"
         }
       ]
     },
index 78b3699b579f25219d43bfd29ab1ada3a0855189..566d98b3fd82f40a62bb33b5adda6e791893b024 100644 (file)
@@ -59,8 +59,8 @@
             "Z": 1.940211
           },
           "TerritoryId": 820,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - The Heroes' Gauntlet"
+          "InteractionType": "Duty",
+          "Comment": "The Heroes' Gauntlet"
         }
       ]
     },
index a9c4e9facdaba525db4c0e32758ec5c544117e1e..67efa3eb85bcc27e18081b389ac145f4825cc05a 100644 (file)
@@ -29,8 +29,8 @@
           },
           "StopDistance": 5,
           "TerritoryId": 931,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty -  The Seat of Sacrifice"
+          "InteractionType": "Duty",
+          "Comment": "The Seat of Sacrifice"
         }
       ]
     },
index 6d639be92ba5aa4f533f27bbd8bccdd7e5307b40..192c55041eca87764ea2aad994a1a1d7f3bdc2c9 100644 (file)
@@ -87,8 +87,8 @@
             "Z": -218.00574
           },
           "TerritoryId": 399,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Matoya's Relict"
+          "InteractionType": "Duty",
+          "Comment": "Matoya's Relict"
         }
       ]
     },
index 6499138b9c12de6efa58cc1508882bac7dd9eeef..c42b21e6d0d811a32af4649ca05312a0316e4743 100644 (file)
@@ -63,8 +63,8 @@
             "Z": -634.54645
           },
           "TerritoryId": 180,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Great Ship Vylbrand"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Great Ship Vylbrand"
         }
       ]
     },
index fd0c1f1485a6ae211c941a4144087fc3d9f6b604..5d8ceac14ce727693e4091c2735b7752cc2ac7cb 100644 (file)
@@ -64,8 +64,8 @@
             "Z": 12.893799
           },
           "TerritoryId": 130,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Paglth'an"
+          "InteractionType": "Duty",
+          "Comment": "Paglth'an"
         }
       ]
     },
index e8d330554365debf1ee10e5f8875045bfb193b4b..9789885055e4a53a906ac0b562c58c7e178bb3ae 100644 (file)
@@ -45,8 +45,8 @@
           },
           "StopDistance": 7,
           "TerritoryId": 132,
-          "InteractionType": "ManualAction",
-          "Comment": "Duty - Death Unto Dawn"
+          "InteractionType": "SinglePlayerDuty",
+          "Comment": "Death Unto Dawn"
         }
       ]
     },
@@ -55,7 +55,7 @@
       "Steps": [
         {
           "TerritoryId": 351,
-          "InteractionType": "ManualAction",
+          "InteractionType": "WaitForManualProgress",
           "Comment": "Credits"
         }
       ]
index 7bdcdf7cf8ce1ce835889e35c50dec60bf11077d..27d30856c91fd26842dc251622c99caef71b20e2 100644 (file)
                     "Say",
                     "Emote",
                     "WaitForNpcAtPosition",
-                    "ManualAction"
+                    "WaitForManualProgress",
+                    "Duty",
+                    "SinglePlayerDuty",
+                    "ShouldBeAJump",
+                    "Instruction"
                   ]
                 },
                 "Disabled": {
                   "enum": [
                     "AutoOnEnterArea",
                     "AfterInteraction",
-                    "AfterItemUse"
+                    "AfterItemUse",
+                    "OverworldEnemies"
                   ]
                 },
                 "KillEnemyDataIds": {