Split 'ManualAction' into different contextual elements

This commit is contained in:
Liza 2024-06-01 01:49:11 +02:00
parent 488c963a22
commit f9a4008564
Signed by: liza
GPG Key ID: 7199F8D727D55F67
69 changed files with 172 additions and 128 deletions

View File

@ -347,7 +347,8 @@ internal sealed class QuestController
}; };
} }
else 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); AetheryteConverter.IsLargeAetheryte(from) ? 10.9f : 6.9f);
return; return;
@ -576,6 +577,27 @@ internal sealed class QuestController
IncreaseStepCount(); IncreaseStepCount();
break; 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: default:
_pluginLog.Warning($"Action '{step.InteractionType}' is not implemented"); _pluginLog.Warning($"Action '{step.InteractionType}' is not implemented");
break; break;

View File

@ -9,5 +9,6 @@ public sealed class EnemySpawnTypeConverter() : EnumConverter<EEnemySpawnType>(V
{ EEnemySpawnType.AfterInteraction, "AfterInteraction" }, { EEnemySpawnType.AfterInteraction, "AfterInteraction" },
{ EEnemySpawnType.AfterItemUse, "AfterItemUse" }, { EEnemySpawnType.AfterItemUse, "AfterItemUse" },
{ EEnemySpawnType.AutoOnEnterArea, "AutoOnEnterArea" }, { EEnemySpawnType.AutoOnEnterArea, "AutoOnEnterArea" },
{ EEnemySpawnType.OverworldEnemies, "OverworldEnemies" },
}; };
} }

View File

@ -16,6 +16,10 @@ public sealed class InteractionTypeConverter() : EnumConverter<EInteractionType>
{ EInteractionType.Say, "Say" }, { EInteractionType.Say, "Say" },
{ EInteractionType.Emote, "Emote" }, { EInteractionType.Emote, "Emote" },
{ EInteractionType.WaitForObjectAtPosition, "WaitForNpcAtPosition" }, { EInteractionType.WaitForObjectAtPosition, "WaitForNpcAtPosition" },
{ EInteractionType.ManualAction, "ManualAction" } { EInteractionType.WaitForManualProgress, "WaitForManualProgress" },
{ EInteractionType.Duty, "Duty" },
{ EInteractionType.SinglePlayerDuty, "SinglePlayerDuty" },
{ EInteractionType.Jump, "ShouldBeAJump" },
{ EInteractionType.Instruction, "Instruction" },
}; };
} }

View File

@ -10,4 +10,5 @@ public enum EEnemySpawnType
AfterInteraction, AfterInteraction,
AfterItemUse, AfterItemUse,
AutoOnEnterArea, AutoOnEnterArea,
OverworldEnemies,
} }

View File

@ -16,5 +16,14 @@ public enum EInteractionType
Say, Say,
Emote, Emote,
WaitForObjectAtPosition, WaitForObjectAtPosition,
ManualAction WaitForManualProgress,
Duty,
SinglePlayerDuty,
Jump,
/// <summary>
/// Needs to be manually continued.
/// </summary>
Instruction,
} }

View File

@ -28,7 +28,7 @@
"Z": 509.72766 "Z": 509.72766
}, },
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Follow" "Comment": "Follow"
}, },
{ {

View File

@ -43,7 +43,7 @@
"Z": -668.9708 "Z": -668.9708
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Follow Azure-haired Boy" "Comment": "Follow Azure-haired Boy"
}, },
{ {

View File

@ -46,7 +46,7 @@
"Z": -807.82135 "Z": -807.82135
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"Comment": "Navmesh can't jump (TODO this is super out of the way)" "Comment": "Navmesh can't jump (TODO this is super out of the way)"
}, },
{ {

View File

@ -27,7 +27,7 @@
"Z": -646.97064 "Z": -646.97064
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"Comment": "Navmesh can't jump" "Comment": "Navmesh can't jump"
}, },
{ {
@ -57,7 +57,7 @@
"Z": -420.43494 "Z": -420.43494
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"Comment": "Navmesh can't jump" "Comment": "Navmesh can't jump"
}, },
{ {

View File

@ -27,8 +27,9 @@
"Z": -523.8633 "Z": -523.8633
}, },
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "ManualAction", "InteractionType": "Combat",
"Comment": "Kill 2 Drifting Ea", "EnemySpawnType": "OverworldEnemies",
"Comment": "Kill 2 Drifting Ea, TODO: add data ids",
"$": "QuestVariables: 0 0-16-32 0 0 0 0" "$": "QuestVariables: 0 0-16-32 0 0 0 0"
} }
] ]

View File

@ -28,7 +28,7 @@
}, },
"StopDistance": 0.5, "StopDistance": 0.5,
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"EnemySpawnType": "AutoOnEnterArea", "EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [ "KillEnemyDataIds": [
14044 14044

View File

@ -47,7 +47,7 @@
"Z": -27.054321 "Z": -27.054321
}, },
"TerritoryId": 962, "TerritoryId": 962,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Follow Alisaie" "Comment": "Follow Alisaie"
} }
] ]

View File

@ -108,7 +108,7 @@
"Z": -519.18823 "Z": -519.18823
}, },
"TerritoryId": 956, "TerritoryId": 956,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Shoot Large Green Bird" "Comment": "Duty - Shoot Large Green Bird"
} }
] ]

View File

@ -43,7 +43,7 @@
"Z": 799.2217 "Z": 799.2217
}, },
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (2, 2, 1)" "Comment": "Talk (2, 2, 1)"
} }
] ]
@ -59,7 +59,7 @@
"Z": 681.7273 "Z": 681.7273
}, },
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (2, 1, 2)" "Comment": "Talk (2, 1, 2)"
} }
] ]
@ -75,7 +75,7 @@
"Z": 517.72327 "Z": 517.72327
}, },
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (2, 2, 2)" "Comment": "Talk (2, 2, 2)"
} }
] ]

View File

@ -60,8 +60,8 @@
"Z": -663.81323 "Z": -663.81323
}, },
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Tower of Zot" "Comment": "The Tower of Zot"
} }
] ]
}, },

View File

@ -31,8 +31,8 @@
"Z": 539.6046 "Z": 539.6046
}, },
"TerritoryId": 621, "TerritoryId": 621,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - A Frosty Reception" "Comment": "A Frosty Reception"
} }
] ]
}, },

View File

@ -142,8 +142,8 @@
"Z": 390.46313 "Z": 390.46313
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Follow Girl in Green" "Comment": "Follow Girl in Green"
} }
] ]
}, },

View File

@ -115,7 +115,7 @@
"Z": 251.71986 "Z": 251.71986
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"DisableNavmesh": true, "DisableNavmesh": true,
"Comment": "Jump on Pipeline and move near the Aether Current" "Comment": "Jump on Pipeline and move near the Aether Current"
}, },

View File

@ -77,7 +77,7 @@
"Z": 365.7129 "Z": 365.7129
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Follow Alphinaud and Alisaie" "Comment": "Follow Alphinaud and Alisaie"
} }
] ]

View File

@ -48,7 +48,7 @@
"Z": -402.64487 "Z": -402.64487
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"Comment": "Jump to Aether Current" "Comment": "Jump to Aether Current"
}, },
{ {
@ -69,7 +69,7 @@
"Z": -398.82806 "Z": -398.82806
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"Comment": "Leave the Aether Current location" "Comment": "Leave the Aether Current location"
}, },
{ {
@ -79,7 +79,7 @@
"Z": -337.21478 "Z": -337.21478
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"Comment": "Jump onto the Highway" "Comment": "Jump onto the Highway"
}, },
{ {
@ -226,7 +226,7 @@
"Z": 94.77368 "Z": 94.77368
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [ "KillEnemyDataIds": [
14079 14079
@ -258,7 +258,7 @@
"Z": 396.96338 "Z": 396.96338
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [ "KillEnemyDataIds": [
14080 14080

View File

@ -28,8 +28,8 @@
"Z": 488.3954 "Z": 488.3954
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Start Duty" "Comment": "In from the Cold"
} }
] ]
}, },

View File

@ -105,8 +105,8 @@
"Z": -676.875 "Z": -676.875
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Tower of Babil" "Comment": "The Tower of Babil"
} }
] ]
}, },

View File

@ -89,7 +89,7 @@
"Z": 419.7605 "Z": 419.7605
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"Comment": "Follow Argos" "Comment": "Follow Argos"
}, },
{ {
@ -148,7 +148,7 @@
"Z": 523.5217 "Z": 523.5217
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "Instruction",
"Comment": "Follow Argos" "Comment": "Follow Argos"
}, },
{ {

View File

@ -46,8 +46,8 @@
"Z": 103.227295 "Z": 103.227295
}, },
"TerritoryId": 1028, "TerritoryId": 1028,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Zodiark" "Comment": "The Dark Inside"
} }
] ]
}, },

View File

@ -45,8 +45,8 @@
"Z": -269.24548 "Z": -269.24548
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Follow Urianger" "Comment": "Follow Urianger"
} }
] ]
}, },
@ -61,8 +61,8 @@
"Z": -269.24548 "Z": -269.24548
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Follow Urianger (but you failed the first time)" "Comment": "Follow Urianger (but you failed the first time)"
} }
] ]
}, },

View File

@ -136,7 +136,7 @@
"Z": -558.8681 "Z": -558.8681
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"AetheryteShortcut": "Mare Lamentorum - Bestways Burrow", "AetheryteShortcut": "Mare Lamentorum - Bestways Burrow",
"Comment": "Navmesh can't jump" "Comment": "Navmesh can't jump"
}, },
@ -184,8 +184,8 @@
"Z": -654.13904 "Z": -654.13904
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Find Runninway" "Comment": "Find \"Runninway?\""
} }
] ]
}, },

View File

@ -70,8 +70,8 @@
"Z": 761.50134 "Z": 761.50134
}, },
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Vanaspati" "Comment": "Vanaspati"
} }
] ]
}, },

View File

@ -50,7 +50,7 @@
"Z": -210.52875 "Z": -210.52875
}, },
"TerritoryId": 819, "TerritoryId": 819,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Cutscene Interaction needed", "Comment": "Cutscene Interaction needed",
"AetheryteShortcut": "Crystarium", "AetheryteShortcut": "Crystarium",
"AethernetShortcut": [ "AethernetShortcut": [

View File

@ -39,7 +39,7 @@
{ {
"DataId": 1039998, "DataId": 1039998,
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Capture Mobs with less than 50% HP" "Comment": "Capture Mobs with less than 50% HP"
} }
] ]

View File

@ -37,7 +37,7 @@
"Z": 543.8281 "Z": 543.8281
}, },
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"Comment": "Jump on Ledge" "Comment": "Jump on Ledge"
}, },
{ {

View File

@ -84,7 +84,7 @@
"Z": -173.75458 "Z": -173.75458
}, },
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (1, 2, 1)" "Comment": "Talk (1, 2, 1)"
} }
] ]
@ -124,7 +124,7 @@
"Z": -155.5047 "Z": -155.5047
}, },
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (2, 2, 1)" "Comment": "Talk (2, 2, 1)"
} }
] ]

View File

@ -64,8 +64,8 @@
"Z": 62.302612 "Z": 62.302612
}, },
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Venat" "Comment": "Venat"
} }
] ]
}, },

View File

@ -48,8 +48,8 @@
}, },
"StopDistance": 4, "StopDistance": 4,
"TerritoryId": 961, "TerritoryId": 961,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Ktisis Hyperborea" "Comment": "Ktisis Hyperborea"
} }
] ]
}, },

View File

@ -28,9 +28,9 @@
"Z": 501.85388 "Z": 501.85388
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"AetheryteShortcut": "Garlemald - Camp Broken Glass", "AetheryteShortcut": "Garlemald - Camp Broken Glass",
"Comment": "Duty - As the Heavens Burn" "Comment": "As the Heavens Burn"
} }
] ]
}, },

View File

@ -45,7 +45,7 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 956, "TerritoryId": 956,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Find Points of Interest" "Comment": "Find Points of Interest"
} }
] ]

View File

@ -99,7 +99,7 @@
"Z": 681.35846 "Z": 681.35846
}, },
"TerritoryId": 956, "TerritoryId": 956,
"InteractionType": "ManualAction", "InteractionType": "ShouldBeAJump",
"DisableNavmesh": true, "DisableNavmesh": true,
"Comment": "Navmesh can't jump" "Comment": "Navmesh can't jump"
}, },

View File

@ -43,8 +43,8 @@
"Z": 341.29846 "Z": 341.29846
}, },
"TerritoryId": 956, "TerritoryId": 956,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Aitiascope" "Comment": "Aitiascope"
} }
] ]
}, },

View File

@ -82,7 +82,7 @@
"Z": -62.485718 "Z": -62.485718
}, },
"TerritoryId": 962, "TerritoryId": 962,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (2, 2, 2, N/A, 2)" "Comment": "Talk (2, 2, 2, N/A, 2)"
} }
] ]

View File

@ -96,7 +96,7 @@
"Z": 375.50916 "Z": 375.50916
}, },
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Duty - Find Errant Omicron" "Comment": "Duty - Find Errant Omicron"
} }
] ]

View File

@ -44,7 +44,7 @@
"Z": 398.42822 "Z": 398.42822
}, },
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Identify Anomaly (Elbow/Knee)" "Comment": "Identify Anomaly (Elbow/Knee)"
} }
] ]

View File

@ -31,8 +31,8 @@
"Z": -9.079163 "Z": -9.079163
}, },
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Dead Ends" "Comment": "The Dead Ends"
} }
] ]
}, },
@ -48,8 +48,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 1029, "TerritoryId": 1029,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Final Day" "Comment": "The Final Day"
} }
] ]
}, },
@ -64,8 +64,8 @@
"Z": 89.98242 "Z": 89.98242
}, },
"TerritoryId": 1026, "TerritoryId": 1026,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Zenos" "Comment": "Zenos"
} }
] ]
}, },

View File

@ -48,7 +48,7 @@
"Z": -225.42157 "Z": -225.42157
}, },
"TerritoryId": 963, "TerritoryId": 963,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Talk (1, 1, 1, 2)" "Comment": "Talk (1, 1, 1, 2)"
} }
] ]

View File

@ -31,8 +31,8 @@
"Z": 610.65076 "Z": 610.65076
}, },
"TerritoryId": 957, "TerritoryId": 957,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Alzadaal's Legacy" "Comment": "Alzadaal's Legacy"
} }
] ]
}, },

View File

@ -75,8 +75,8 @@
"Z": -89.463684 "Z": -89.463684
}, },
"TerritoryId": 1056, "TerritoryId": 1056,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Fell Court of Troia" "Comment": "Fell Court of Troia"
} }
] ]
}, },

View File

@ -69,8 +69,8 @@
"Z": -150.83551 "Z": -150.83551
}, },
"TerritoryId": 1089, "TerritoryId": 1089,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Where Everything Begins" "Comment": "Where Everything Begins"
} }
] ]
}, },

View File

@ -45,8 +45,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 1092, "TerritoryId": 1092,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Storm's Crown" "Comment": "Storm's Crown"
} }
] ]
}, },

View File

@ -47,7 +47,8 @@
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [ "KillEnemyDataIds": [
16028, 16029 16028,
16029
], ],
"$.0": "[1]", "$.0": "[1]",
"$.1": "QuestVariables if done first: 16 5(enemy kill count) 0 0 0 64" "$.1": "QuestVariables if done first: 16 5(enemy kill count) 0 0 0 64"

View File

@ -29,8 +29,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - An Unforeseen Bargain" "Comment": "An Unforeseen Bargain"
} }
] ]
}, },

View File

@ -61,8 +61,8 @@
}, },
"TerritoryId": 958, "TerritoryId": 958,
"StopDistance": 5, "StopDistance": 5,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Lapis Manalis" "Comment": "Lapis Manalis"
} }
] ]
}, },

View File

@ -58,8 +58,8 @@
"Z": 45.63965 "Z": 45.63965
}, },
"TerritoryId": 1125, "TerritoryId": 1125,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Mount Ordeals" "Comment": "Mount Ordeals"
} }
] ]
}, },

View File

@ -139,8 +139,8 @@
"Z": 238.0937 "Z": 238.0937
}, },
"TerritoryId": 962, "TerritoryId": 962,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Aetherfont" "Comment": "The Aetherfont"
} }
] ]
}, },

View File

@ -43,8 +43,8 @@
"Z": 101.823364 "Z": 101.823364
}, },
"TerritoryId": 1159, "TerritoryId": 1159,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Voidcast Dais" "Comment": "The Voidcast Dais"
} }
] ]
}, },

View File

@ -43,8 +43,8 @@
"Z": 298.20703 "Z": 298.20703
}, },
"TerritoryId": 817, "TerritoryId": 817,
"InteractionType": "ManualAction", "InteractionType": "Say",
"Comment": "/say allin tuta" "ChatMessage": "allin tuta"
} }
] ]
}, },

View File

@ -28,8 +28,8 @@
"Z": 439.96326 "Z": 439.96326
}, },
"TerritoryId": 1162, "TerritoryId": 1162,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Lunar Subterrane" "Comment": "The Lunar Subterrane"
} }
] ]
}, },
@ -59,8 +59,8 @@
"Z": 106.3549 "Z": 106.3549
}, },
"TerritoryId": 1181, "TerritoryId": 1181,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Abyssal Fracture" "Comment": "The Abyssal Fracture"
} }
] ]
}, },

View File

@ -28,8 +28,8 @@
"Z": 243.42712 "Z": 243.42712
}, },
"TerritoryId": 962, "TerritoryId": 962,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - The Game Is Afoot", "Comment": "The Game Is Afoot",
"AethernetShortcut": [ "AethernetShortcut": [
"[Old Sharlayan] The Studium", "[Old Sharlayan] The Studium",
"[Old Sharlayan] Scholar's Harbor" "[Old Sharlayan] Scholar's Harbor"

View File

@ -15,8 +15,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 818, "TerritoryId": 818,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Amaurot" "Comment": "Amaurot"
} }
] ]
}, },
@ -32,8 +32,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 881, "TerritoryId": 881,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Dying Gasp" "Comment": "The Dying Gasp"
} }
] ]
}, },

View File

@ -54,8 +54,8 @@
"Z": 647.6997 "Z": 647.6997
}, },
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Grand Cosmos" "Comment": "Grand Cosmos"
} }
] ]
}, },

View File

@ -44,8 +44,8 @@
"Z": -161.45575 "Z": -161.45575
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Help Master Chai dodge enemies" "Comment": "Help Master Chai dodge enemies"
} }
] ]
}, },

View File

@ -69,8 +69,8 @@
"Z": -9.10968 "Z": -9.10968
}, },
"TerritoryId": 351, "TerritoryId": 351,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Estinien vs. Arch Ultima" "Comment": "Estinien vs. Arch Ultima"
} }
] ]
}, },

View File

@ -45,7 +45,7 @@
"Z": -387.10614 "Z": -387.10614
}, },
"TerritoryId": 817, "TerritoryId": 817,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Fly": true, "Fly": true,
"Comment": "Duty - A Sleep Disturbed (Opo-Opo, Wolf, Serpent)" "Comment": "Duty - A Sleep Disturbed (Opo-Opo, Wolf, Serpent)"
} }

View File

@ -46,8 +46,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Anamnesis Anyder" "Comment": "Anamnesis Anyder"
} }
] ]
} }

View File

@ -54,8 +54,8 @@
"Z": -448.3325 "Z": -448.3325
}, },
"TerritoryId": 918, "TerritoryId": 918,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Fight NPCs, then Elidibus" "Comment": "Fight NPCs, then Elidibus"
} }
] ]
}, },

View File

@ -59,8 +59,8 @@
"Z": 1.940211 "Z": 1.940211
}, },
"TerritoryId": 820, "TerritoryId": 820,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Heroes' Gauntlet" "Comment": "The Heroes' Gauntlet"
} }
] ]
}, },

View File

@ -29,8 +29,8 @@
}, },
"StopDistance": 5, "StopDistance": 5,
"TerritoryId": 931, "TerritoryId": 931,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - The Seat of Sacrifice" "Comment": "The Seat of Sacrifice"
} }
] ]
}, },

View File

@ -87,8 +87,8 @@
"Z": -218.00574 "Z": -218.00574
}, },
"TerritoryId": 399, "TerritoryId": 399,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Matoya's Relict" "Comment": "Matoya's Relict"
} }
] ]
}, },

View File

@ -63,8 +63,8 @@
"Z": -634.54645 "Z": -634.54645
}, },
"TerritoryId": 180, "TerritoryId": 180,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Great Ship Vylbrand" "Comment": "Great Ship Vylbrand"
} }
] ]
}, },

View File

@ -64,8 +64,8 @@
"Z": 12.893799 "Z": 12.893799
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "ManualAction", "InteractionType": "Duty",
"Comment": "Duty - Paglth'an" "Comment": "Paglth'an"
} }
] ]
}, },

View File

@ -45,8 +45,8 @@
}, },
"StopDistance": 7, "StopDistance": 7,
"TerritoryId": 132, "TerritoryId": 132,
"InteractionType": "ManualAction", "InteractionType": "SinglePlayerDuty",
"Comment": "Duty - Death Unto Dawn" "Comment": "Death Unto Dawn"
} }
] ]
}, },
@ -55,7 +55,7 @@
"Steps": [ "Steps": [
{ {
"TerritoryId": 351, "TerritoryId": 351,
"InteractionType": "ManualAction", "InteractionType": "WaitForManualProgress",
"Comment": "Credits" "Comment": "Credits"
} }
] ]

View File

@ -102,7 +102,11 @@
"Say", "Say",
"Emote", "Emote",
"WaitForNpcAtPosition", "WaitForNpcAtPosition",
"ManualAction" "WaitForManualProgress",
"Duty",
"SinglePlayerDuty",
"ShouldBeAJump",
"Instruction"
] ]
}, },
"Disabled": { "Disabled": {
@ -337,7 +341,8 @@
"enum": [ "enum": [
"AutoOnEnterArea", "AutoOnEnterArea",
"AfterInteraction", "AfterInteraction",
"AfterItemUse" "AfterItemUse",
"OverworldEnemies"
] ]
}, },
"KillEnemyDataIds": { "KillEnemyDataIds": {