Update THM paths; fix /cry being the wrong emote

This commit is contained in:
Liza 2024-11-03 20:18:00 +01:00
parent 9aad77e486
commit 1f5b9ac687
Signed by: liza
GPG Key ID: 7199F8D727D55F67
7 changed files with 119 additions and 77 deletions

View File

@ -103,7 +103,7 @@
"Y": 3.082914, "Y": 3.082914,
"Z": 272.46896 "Z": 272.46896
}, },
"TerritoryId": 148, "TerritoryId": 141,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies", "EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [ "ComplexCombatData": [

View File

@ -93,6 +93,16 @@
{ {
"Sequence": 4, "Sequence": 4,
"Steps": [ "Steps": [
{
"Position": {
"X": -253.97243,
"Y": 33.2412,
"Z": 408.68488
},
"TerritoryId": 140,
"InteractionType": "WalkTo",
"Fly": true
},
{ {
"DataId": 1002027, "DataId": 1002027,
"Position": { "Position": {
@ -101,8 +111,7 @@
"Z": 407.27856 "Z": 407.27856
}, },
"TerritoryId": 140, "TerritoryId": 140,
"InteractionType": "Interact", "InteractionType": "Interact"
"Fly": true
} }
] ]
}, },

View File

@ -46,12 +46,8 @@
"Sequence": 2, "Sequence": 2,
"Steps": [ "Steps": [
{ {
"Position": { "TerritoryId": 130,
"X": 149.07747, "InteractionType": "None",
"Y": -2,
"Z": -225.21188
},
"TerritoryId": 141,
"AetheryteShortcut": "Ul'dah", "AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [ "AethernetShortcut": [
"[Ul'dah] Thaumaturges' Guild", "[Ul'dah] Thaumaturges' Guild",
@ -62,9 +58,43 @@
"InSameTerritory": true, "InSameTerritory": true,
"InTerritory": [ "InTerritory": [
141 141
] ],
"AetheryteUnlocked": "Central Thanalan - Black Brush Station"
},
"AethernetShortcutIf": {
"AetheryteUnlocked": "Central Thanalan - Black Brush Station"
}
} }
}, },
{
"Position": {
"X": -62.183617,
"Y": -3.6582246,
"Z": 145.88391
},
"InteractionType": "WalkTo",
"TerritoryId": 141,
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked",
"AetheryteUnlocked": "Central Thanalan - Black Brush Station"
}
}
},
{
"Position": {
"X": 149.07747,
"Y": -2,
"Z": -225.21188
},
"TerritoryId": 141,
"AetheryteShortcut": "Central Thanalan - Black Brush Station",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
},
"Fly": true,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies", "EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [ "ComplexCombatData": [

View File

@ -121,11 +121,11 @@
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{ {
"DataId": 1001710, "DataId": 1001711,
"Position": { "Position": {
"X": -240.2533, "X": -241.62665,
"Y": 18.8, "Y": 18.8,
"Z": 86.900024 "Z": 83.32947
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",

View File

@ -34,19 +34,12 @@
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{ {
"DataId": 1004094, "TerritoryId": 145,
"Position": { "InteractionType": "UseItem",
"X": -413.47375, "ItemId": 30362,
"Y": 23.113977, "TargetTerritoryId": 140,
"Z": -383.71863
},
"TerritoryId": 140,
"InteractionType": "Interact",
"AetheryteShortcut": "Western Thanalan - Horizon",
"Fly": true,
"SkipConditions": { "SkipConditions": {
"AetheryteShortcutIf": { "StepIf": {
"InSameTerritory": true,
"InTerritory": [ "InTerritory": [
140 140
] ]
@ -72,6 +65,16 @@
}, },
"TerritoryId": 140, "TerritoryId": 140,
"InteractionType": "Interact" "InteractionType": "Interact"
},
{
"DataId": 1004094,
"Position": {
"X": -413.47375,
"Y": 23.113977,
"Z": -383.71863
},
"TerritoryId": 140,
"InteractionType": "Interact"
} }
] ]
}, },

View File

@ -11,6 +11,7 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ EEmote.Cheer, "cheer" }, { EEmote.Cheer, "cheer" },
{ EEmote.Clap, "clap" }, { EEmote.Clap, "clap" },
{ EEmote.Comfort, "comfort" }, { EEmote.Comfort, "comfort" },
{ EEmote.Cry, "cry" },
{ EEmote.Dance, "dance" }, { EEmote.Dance, "dance" },
{ EEmote.Doubt, "doubt" }, { EEmote.Doubt, "doubt" },
{ EEmote.Doze, "doze" }, { EEmote.Doze, "doze" },
@ -31,7 +32,6 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ EEmote.Disappointed, "disappointed" }, { EEmote.Disappointed, "disappointed" },
{ EEmote.Pray, "pray" }, { EEmote.Pray, "pray" },
{ EEmote.ImperialSalute, "imperialsalute" }, { EEmote.ImperialSalute, "imperialsalute" },
{ EEmote.Cry, "cry" },
{ EEmote.Pet, "pet" }, { EEmote.Pet, "pet" },
{ EEmote.Slap, "slap" }, { EEmote.Slap, "slap" },
{ EEmote.SundropDance, "sundropdance"}, { EEmote.SundropDance, "sundropdance"},

View File

@ -12,6 +12,7 @@ public enum EEmote
Cheer = 6, Cheer = 6,
Clap = 7, Clap = 7,
Comfort = 9, Comfort = 9,
Cry = 10,
Dance = 11, Dance = 11,
Doubt = 12, Doubt = 12,
Doze = 13, Doze = 13,
@ -32,7 +33,6 @@ public enum EEmote
Disappointed = 49, Disappointed = 49,
Pray = 58, Pray = 58,
ImperialSalute = 59, ImperialSalute = 59,
Cry = 74,
Pet = 105, Pet = 105,
Slap = 111, Slap = 111,
SundropDance = 120, SundropDance = 120,