master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
14 changed files with 1135 additions and 66 deletions
Showing only changes of commit c3dbb144e4 - Show all commits

View File

@ -36,7 +36,7 @@
"Yes": true "Yes": true
} }
], ],
"NextQuestId": 553 "NextQuestId": 351
} }
] ]
} }

View File

@ -36,7 +36,8 @@
"Prompt": "TEXT_CLSTHM020_00345_Q1_001_1", "Prompt": "TEXT_CLSTHM020_00345_Q1_001_1",
"Yes": true "Yes": true
} }
] ],
"NextQuestId": 351
} }
] ]
} }

View File

@ -0,0 +1,151 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"Position": {
"X": -71.92632,
"Y": 9.839797,
"Z": 283.98495
},
"TerritoryId": 141,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 351,
"MinimumKillCount": 3,
"$": "Slay star marmots as a thaumaturge",
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
null,
null,
null,
null,
null
]
},
{
"DataId": 385,
"MinimumKillCount": 3,
"$": "Slay huge hornets as a thaumaturge",
"CompletionQuestVariablesFlags": [
null,
{
"High": 3
},
null,
null,
null,
null
]
}
],
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Thaumaturges' Guild",
"[Ul'dah] Gate of Nald (Central Thanalan)"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
141
]
}
},
"CompletionQuestVariablesFlags": [
{
"Low": 3
},
{
"High": 3
},
null,
null,
null,
null
]
},
{
"Position": {
"X": 39.449,
"Y": 3.082914,
"Z": 272.46896
},
"TerritoryId": 148,
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 205,
"MinimumKillCount": 3,
"$": "Slay snapping shrews as a thaumaturge"
}
],
"CompletionQuestVariablesFlags": [
null,
{
"Low": 3
},
null,
null,
null,
null
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"NextQuestId": 351
}
]
}
]
}

View File

@ -0,0 +1,131 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1001709,
"Position": {
"X": -240.4975,
"Y": 18.7,
"Z": 85.58777
},
"TerritoryId": 130,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 2001468,
"Position": {
"X": -87.38843,
"Y": 50.614136,
"Z": 315.6023
},
"TerritoryId": 140,
"InteractionType": "UseItem",
"ItemId": 2000414,
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Thaumaturges' Guild",
"[Ul'dah] Gate of the Sultana (Western Thanalan)"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
140
]
}
}
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 2001469,
"Position": {
"X": -74.96759,
"Y": 53.238647,
"Z": 336.78186
},
"TerritoryId": 140,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
12
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1002027,
"Position": {
"X": -255.23767,
"Y": 33.238777,
"Z": 407.27856
},
"TerritoryId": 140,
"InteractionType": "Interact",
"Fly": true
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1001709,
"Position": {
"X": -240.4975,
"Y": 18.7,
"Z": 85.58777
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"NextQuestId": 349
}
]
}
]
}

View File

@ -0,0 +1,185 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 149.07747,
"Y": -2,
"Z": -225.21188
},
"TerritoryId": 141,
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Thaumaturges' Guild",
"[Ul'dah] Gate of Nald (Central Thanalan)"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
141
]
}
},
"InteractionType": "Combat",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 160,
"MinimumKillCount": 8,
"$": "Slay efts",
"CompletionQuestVariablesFlags": [
{
"Low": 8
},
null,
null,
null,
null,
null
]
}
]
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "Interact",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
},
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_CLSTHM101_00349_Q_000_1",
"Answer": "TEXT_CLSTHM101_00349_A_000_3"
}
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 2001512,
"Position": {
"X": -366.29285,
"Y": -34.989014,
"Z": 293.56824
},
"TerritoryId": 145,
"InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
166
],
"Fly": true,
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 2001499,
"Position": {
"X": -366.29285,
"Y": -34.989014,
"Z": 293.56824
},
"TerritoryId": 145,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"NextQuestId": 350
}
]
}
]
}

View File

@ -0,0 +1,149 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1001711,
"Position": {
"X": -241.62665,
"Y": 18.8,
"Z": 83.32947
},
"TerritoryId": 130,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1002301,
"Position": {
"X": -178.2102,
"Y": 18,
"Z": 61.41748
},
"TerritoryId": 130,
"InteractionType": "Emote",
"Emote": "cry"
},
{
"DataId": 1002300,
"Position": {
"X": -176.9284,
"Y": 18,
"Z": 62.363525
},
"TerritoryId": 130,
"InteractionType": "Emote",
"Emote": "cry"
},
{
"DataId": 1002302,
"Position": {
"X": -176.71478,
"Y": 18,
"Z": 64.34729
},
"TerritoryId": 130,
"InteractionType": "Emote",
"Emote": "cry"
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1001711,
"Position": {
"X": -241.62665,
"Y": 18.8,
"Z": 83.32947
},
"TerritoryId": 130,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 2001470,
"Position": {
"X": -24.887512,
"Y": -25.345276,
"Z": 321.94995
},
"TerritoryId": 145,
"InteractionType": "SinglePlayerDuty",
"Fly": true,
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true
}
}
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_CLSTHM150_00350_Q1_000_1",
"Answer": "TEXT_CLSTHM150_00350_A1_000_1"
}
],
"NextQuestId": 352
}
]
}
]
}

View File

@ -209,7 +209,8 @@
"Z": 80.88806 "Z": 80.88806
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "CompleteQuest" "InteractionType": "CompleteQuest",
"NextQuestId": 352
} }
] ]
} }

View File

@ -0,0 +1,199 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1001709,
"Position": {
"X": -240.4975,
"Y": 18.7,
"Z": 85.58777
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
130
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1002309,
"Position": {
"X": -374.28857,
"Y": -57.079987,
"Z": 144.12134
},
"TerritoryId": 145,
"InteractionType": "Interact",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
145
]
}
}
},
{
"DataId": 1002308,
"Position": {
"X": -386.7094,
"Y": -59.300003,
"Z": 166.39954
},
"TerritoryId": 145,
"InteractionType": "Interact"
},
{
"DataId": 1002307,
"Position": {
"X": -396.65833,
"Y": -48.15,
"Z": 99.68713
},
"TerritoryId": 145,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "Interact",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
130
]
}
}
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1001709,
"Position": {
"X": -240.4975,
"Y": 18.7,
"Z": 85.58777
},
"TerritoryId": 130,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 5,
"Steps": [
{
"Position": {
"X": 222.64497,
"Y": 5.099169,
"Z": -265.77835
},
"TerritoryId": 145,
"Fly": true,
"InteractionType": "WalkTo",
"AetheryteShortcut": "Eastern Thanalan - Camp Drybone",
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
145
]
}
}
},
{
"DataId": 1002310,
"Position": {
"X": 184.89343,
"Y": 3.1809213,
"Z": -338.64355
},
"TerritoryId": 145,
"InteractionType": "SinglePlayerDuty"
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
130
]
}
},
"NextQuestId": 353
}
]
}
]
}

View File

@ -0,0 +1,180 @@
{
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "pot0to",
"QuestSequence": [
{
"Sequence": 0,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
130
]
}
}
}
]
},
{
"Sequence": 1,
"Steps": [
{
"DataId": 1004094,
"Position": {
"X": -413.47375,
"Y": 23.113977,
"Z": -383.71863
},
"TerritoryId": 140,
"InteractionType": "Interact",
"AetheryteShortcut": "Western Thanalan - Horizon",
"Fly": true,
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
140
]
}
}
},
{
"DataId": 1004070,
"Position": {
"X": -455.86328,
"Y": 23.11398,
"Z": -326.92456
},
"TerritoryId": 140,
"InteractionType": "Interact"
},
{
"DataId": 1004096,
"Position": {
"X": -444.75476,
"Y": 25,
"Z": -324.26947
},
"TerritoryId": 140,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"DataId": 1002316,
"Position": {
"X": -436.72852,
"Y": 23.774809,
"Z": -350.8202
},
"TerritoryId": 140,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 3,
"Steps": [
{
"DataId": 1002315,
"Position": {
"X": -392.32477,
"Y": 23.557693,
"Z": -546.9902
},
"TerritoryId": 140,
"InteractionType": "Combat",
"Fly": true,
"EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [
1239
]
}
]
},
{
"Sequence": 4,
"Steps": [
{
"DataId": 1002315,
"Position": {
"X": -392.32477,
"Y": 23.557693,
"Z": -546.9902
},
"TerritoryId": 140,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 5,
"Steps": [
{
"DataId": 1002317,
"Position": {
"X": -269.85577,
"Y": 15.346575,
"Z": -718.1354
},
"TerritoryId": 140,
"InteractionType": "SinglePlayerDuty",
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_CLSTHM300_00353_Q_000_1",
"Answer": "TEXT_CLSTHM300_00353_A_000_2"
}
]
}
]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1001708,
"Position": {
"X": -250.3548,
"Y": 18,
"Z": 80.88806
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza",
"[Ul'dah] Thaumaturges' Guild"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
130
]
}
}
}
]
}
]
}

View File

@ -1,7 +1,6 @@
{ {
"$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json", "$schema": "https://git.carvel.li/liza/Questionable/raw/branch/master/QuestPaths/quest-v1.json",
"Author": "liza", "Author": "pot0to",
"Disabled": true,
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 0, "Sequence": 0,
@ -13,7 +12,8 @@
"Z": -273.68756 "Z": -273.68756
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "WalkTo" "InteractionType": "WalkTo",
"Fly": true
}, },
{ {
"DataId": 1044403, "DataId": 1044403,
@ -30,6 +30,38 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{
"DataId": 1044412,
"Position": {
"X": -181.56714,
"Y": -49.19972,
"Z": -304.76843
},
"TerritoryId": 959,
"InteractionType": "Interact"
}
]
},
{
"Sequence": 2,
"Steps": [
{
"TerritoryId": 959,
"InteractionType": "Craft",
"ItemId": 38871,
"ItemCount": 1
},
{
"DataId": 1044584,
"Position": {
"X": 563.8971,
"Y": -167.50002,
"Z": -594.53723
},
"TerritoryId": 959,
"InteractionType": "Interact",
"Fly": true
}
] ]
}, },
{ {
@ -42,7 +74,8 @@
"Z": -273.68756 "Z": -273.68756
}, },
"TerritoryId": 959, "TerritoryId": 959,
"InteractionType": "WalkTo" "InteractionType": "WalkTo",
"Fly": true
}, },
{ {
"DataId": 1044403, "DataId": 1044403,

View File

@ -48,6 +48,31 @@
} }
] ]
}, },
{
"DataId": 2013072,
"Position": {
"X": 456.65674,
"Y": 438.04077,
"Z": 310.2312
},
"TerritoryId": 960,
"InteractionType": "Interact",
"AetheryteShortcut": "Ultima Thule - Base Omicron",
"TargetTerritoryId": 960,
"$": "Portal to A-4 Research"
},
{
"DataId": 1043865,
"Position": {
"X": 301.8081,
"Y": 482.13644,
"Z": 165.02625
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"$": "Last Dregs Host Unit"
},
{ {
"DataId": 1043936, "DataId": 1043936,
"Position": { "Position": {
@ -56,15 +81,25 @@
"Z": 250.93457 "Z": 250.93457
}, },
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "Interact", "InteractionType": "Interact"
"AetheryteShortcut": "Ultima Thule - Base Omicron",
"Mount": true
} }
] ]
}, },
{ {
"Sequence": 255, "Sequence": 255,
"Steps": [ "Steps": [
{
"DataId": 1043864,
"Position": {
"X": 244.83093,
"Y": 564.8203,
"Z": 261.76843
},
"TerritoryId": 960,
"InteractionType": "Interact",
"TargetTerritoryId": 960,
"$": "A-4 Transport Unit"
},
{ {
"DataId": 1043417, "DataId": 1043417,
"Position": { "Position": {

View File

@ -830,6 +830,7 @@
"doze", "doze",
"box", "box",
"sundropdance", "sundropdance",
"cry",
"disappointed", "disappointed",
"examineself", "examineself",
"joy" "joy"

View File

@ -7,38 +7,39 @@ public sealed class EmoteConverter() : EnumConverter<EEmote>(Values)
{ {
private static readonly Dictionary<EEmote, string> Values = new() private static readonly Dictionary<EEmote, string> Values = new()
{ {
{ EEmote.Stretch, "stretch" },
{ EEmote.Wave, "wave" },
{ EEmote.Rally, "rally" },
{ EEmote.Deny, "deny" },
{ EEmote.Pray, "pray" },
{ EEmote.Slap, "slap" },
{ EEmote.Doubt, "doubt" },
{ EEmote.Psych, "psych" },
{ EEmote.Cheer, "cheer" },
{ EEmote.Happy, "happy" },
{ EEmote.Poke, "poke" },
{ EEmote.Flex, "flex" },
{ EEmote.Soothe, "soothe" },
{ EEmote.Me, "me" },
{ EEmote.Welcome, "welcome" },
{ EEmote.ImperialSalute, "imperialsalute" },
{ EEmote.Pet, "pet" },
{ EEmote.Dance, "dance" },
{ EEmote.Respect, "respect" },
{ EEmote.Lookout, "lookout" },
{ EEmote.Kneel, "kneel" },
{ EEmote.Bow, "bow" }, { EEmote.Bow, "bow" },
{ EEmote.Uchiwasshoi, "uchiwasshoi" }, { EEmote.Cheer, "cheer" },
{ EEmote.Clap, "clap" }, { EEmote.Clap, "clap" },
{ EEmote.VictoryPose, "victorypose" },
{ EEmote.Comfort, "comfort" }, { EEmote.Comfort, "comfort" },
{ EEmote.BattleStance, "battlestance" }, { EEmote.Dance, "dance" },
{ EEmote.Doubt, "doubt" },
{ EEmote.Doze, "doze" }, { EEmote.Doze, "doze" },
{ EEmote.Box, "box" }, { EEmote.Wave, "wave" },
{ EEmote.SundropDance, "sundropdance"},
{ EEmote.Disappointed, "disappointed" },
{ EEmote.ExamineSelf, "examineself" },
{ EEmote.Joy, "joy" }, { EEmote.Joy, "joy" },
{ EEmote.Kneel, "kneel" },
{ EEmote.Lookout, "lookout" },
{ EEmote.Me, "me" },
{ EEmote.Deny, "deny" },
{ EEmote.Poke, "poke" },
{ EEmote.Psych, "psych" },
{ EEmote.Rally, "rally" },
{ EEmote.Soothe, "soothe" },
{ EEmote.Stretch, "stretch" },
{ EEmote.Welcome, "welcome" },
{ EEmote.ExamineSelf, "examineself" },
{ EEmote.Happy, "happy" },
{ EEmote.Disappointed, "disappointed" },
{ EEmote.Pray, "pray" },
{ EEmote.ImperialSalute, "imperialsalute" },
{ EEmote.Cry, "cry" },
{ EEmote.Pet, "pet" },
{ EEmote.Slap, "slap" },
{ EEmote.SundropDance, "sundropdance"},
{ EEmote.BattleStance, "battlestance" },
{ EEmote.VictoryPose, "victorypose" },
{ EEmote.Flex, "flex" },
{ EEmote.Respect, "respect" },
{ EEmote.Box, "box" },
{ EEmote.Uchiwasshoi, "uchiwasshoi" }
}; };
} }

View File

@ -8,37 +8,39 @@ public enum EEmote
{ {
None = 0, None = 0,
Stretch = 37,
Wave = 16,
Rally = 34,
Deny = 25,
Pray = 58,
Slap = 111,
Doubt = 12,
Psych = 30,
Cheer = 6,
Happy = 48,
Poke = 28,
Flex = 139,
Soothe = 35,
Me = 23,
Welcome = 41,
ImperialSalute = 59,
Pet = 105,
Dance = 11,
Respect = 140,
Lookout = 22,
Kneel = 19,
Bow = 5, Bow = 5,
Uchiwasshoi = 278, Cheer = 6,
Clap = 7, Clap = 7,
VictoryPose = 122,
Comfort = 9, Comfort = 9,
BattleStance = 121, Dance = 11,
Doubt = 12,
Doze = 13, Doze = 13,
Box = 166, Wave = 16,
SundropDance = 120,
Disappointed = 49,
ExamineSelf = 44,
Joy = 18, Joy = 18,
Kneel = 19,
Lookout = 22,
Me = 23,
Deny = 25,
Poke = 28,
Psych = 30,
Rally = 34,
Soothe = 35,
Stretch = 37,
Welcome = 41,
ExamineSelf = 44,
Happy = 48,
Disappointed = 49,
Pray = 58,
ImperialSalute = 59,
Cry = 74,
Pet = 105,
Slap = 111,
SundropDance = 120,
BattleStance = 121,
VictoryPose = 122,
Flex = 139,
Respect = 140,
Box = 166,
Uchiwasshoi = 278
} }