Use Vesper Bay aetheryte tickets for 'Operation Archon' if you left the Waking Sands

This commit is contained in:
Liza 2025-01-24 19:40:36 +01:00
parent 4f61ea45ed
commit 7731dd0658
Signed by: liza
GPG Key ID: 2C41B84815CF6445
5 changed files with 85 additions and 2 deletions

View File

@ -5,6 +5,71 @@
{ {
"Sequence": 0, "Sequence": 0,
"Steps": [ "Steps": [
{
"TerritoryId": 132,
"InteractionType": "UseItem",
"ItemId": 30362,
"TargetTerritoryId": 140,
"SkipConditions": {
"StepIf": {
"InTerritory": [
140,
212
]
}
}
},
{
"Position": {
"X": -492.96475,
"Y": 20.999884,
"Z": -380.82272
},
"TerritoryId": 140,
"InteractionType": "WalkTo",
"$": "Avoid walking around Waking Sands table",
"SkipConditions": {
"StepIf": {
"InTerritory": [
212
]
}
}
},
{
"DataId": 2001715,
"Position": {
"X": 23.23944,
"Y": 2.090454,
"Z": -0.015319824
},
"TerritoryId": 212,
"InteractionType": "Interact",
"TargetTerritoryId": 212,
"SkipConditions": {
"StepIf": {
"ExtraCondition": "WakingSandsSolar"
}
}
},
{
"DataId": 2001711,
"Position": {
"X": -480.9181,
"Y": 18.00103,
"Z": -386.862
},
"TerritoryId": 140,
"InteractionType": "Interact",
"TargetTerritoryId": 212,
"SkipConditions": {
"StepIf": {
"InTerritory": [
212
]
}
}
},
{ {
"DataId": 1006690, "DataId": 1006690,
"Position": { "Position": {
@ -29,7 +94,14 @@
}, },
"TerritoryId": 212, "TerritoryId": 212,
"InteractionType": "Interact", "InteractionType": "Interact",
"TargetTerritoryId": 212 "TargetTerritoryId": 212,
"SkipConditions": {
"StepIf": {
"InTerritory": [
140
]
}
}
}, },
{ {
"DataId": 2001716, "DataId": 2001716,
@ -40,7 +112,14 @@
}, },
"TerritoryId": 212, "TerritoryId": 212,
"InteractionType": "Interact", "InteractionType": "Interact",
"TargetTerritoryId": 140 "TargetTerritoryId": 140,
"SkipConditions": {
"StepIf": {
"InTerritory": [
140
]
}
}
}, },
{ {
"DataId": 1006578, "DataId": 1006578,

View File

@ -292,6 +292,7 @@
"type": "string", "type": "string",
"enum": [ "enum": [
"WakingSandsMainArea", "WakingSandsMainArea",
"WakingSandsSolar",
"RisingStonesSolar", "RisingStonesSolar",
"RoguesGuild", "RoguesGuild",
"DockStorehouse" "DockStorehouse"

View File

@ -8,6 +8,7 @@ public sealed class SkipConditionConverter() : EnumConverter<EExtraSkipCondition
private static readonly Dictionary<EExtraSkipCondition, string> Values = new() private static readonly Dictionary<EExtraSkipCondition, string> Values = new()
{ {
{ EExtraSkipCondition.WakingSandsMainArea, "WakingSandsMainArea" }, { EExtraSkipCondition.WakingSandsMainArea, "WakingSandsMainArea" },
{ EExtraSkipCondition.WakingSandsSolar, "WakingSandsSolar" },
{ EExtraSkipCondition.RisingStonesSolar, "RisingStonesSolar"}, { EExtraSkipCondition.RisingStonesSolar, "RisingStonesSolar"},
{ EExtraSkipCondition.RoguesGuild, "RoguesGuild"}, { EExtraSkipCondition.RoguesGuild, "RoguesGuild"},
{ EExtraSkipCondition.DockStorehouse, "DockStorehouse"}, { EExtraSkipCondition.DockStorehouse, "DockStorehouse"},

View File

@ -8,6 +8,7 @@ public enum EExtraSkipCondition
{ {
None, None,
WakingSandsMainArea, WakingSandsMainArea,
WakingSandsSolar,
RisingStonesSolar, RisingStonesSolar,
/// <summary> /// <summary>

View File

@ -307,6 +307,7 @@ internal static class SkipCondition
return condition switch return condition switch
{ {
EExtraSkipCondition.WakingSandsMainArea => territoryType == 212 && position.X < 24, EExtraSkipCondition.WakingSandsMainArea => territoryType == 212 && position.X < 24,
EExtraSkipCondition.WakingSandsSolar => territoryType == 212 && position.X >= 24,
EExtraSkipCondition.RisingStonesSolar => territoryType == 351 && position.Z <= -28, EExtraSkipCondition.RisingStonesSolar => territoryType == 351 && position.Z <= -28,
EExtraSkipCondition.RoguesGuild => territoryType == 129 && position.Y <= -115, EExtraSkipCondition.RoguesGuild => territoryType == 129 && position.Y <= -115,
EExtraSkipCondition.DockStorehouse => territoryType == 137 && position.Y <= -20, EExtraSkipCondition.DockStorehouse => territoryType == 137 && position.Y <= -20,