cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 673 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 673 Files Changed 1519 +119 -77
7 changed files with 119 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1f5b9ac687 - Show all commits

2
QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/346_My First Scepter.json
View File

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

13
QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/347_The Threat of Intimacy.json
View File

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

142
QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/349_The Threat of Paucity.json
View File

@ -33,9 +33,9 @@
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "Interact"
@ -43,49 +43,79 @@
]
},
{
"Sequence": 2,
"Steps": [
{
"Position": {
"X": 149.07747,
"Y": -2,
"Z": -225.21188
"Sequence": 2,
"Steps": [
{
"TerritoryId": 130,
"InteractionType": "None",
"AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [
"[Ul'dah] Thaumaturges' Guild",
"[Ul'dah] Gate of Nald (Central Thanalan)"
],
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"InTerritory": [
141
],
"AetheryteUnlocked": "Central Thanalan - Black Brush Station"
},
"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
]
}
]
"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",
"EnemySpawnType": "OverworldEnemies",
"ComplexCombatData": [
{
"DataId": 160,
"MinimumKillCount": 8,
"$": "Slay efts",
"CompletionQuestVariablesFlags": [
{
"Low": 8
},
null,
null,
null,
null,
null
]
}
]
}
]
},
{
"Sequence": 3,
@ -93,9 +123,9 @@
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "Interact",
@ -125,9 +155,9 @@
{
"DataId": 2001512,
"Position": {
"X": -366.29285,
"Y": -34.989014,
"Z": 293.56824
"X": -366.29285,
"Y": -34.989014,
"Z": 293.56824
},
"TerritoryId": 145,
"InteractionType": "Combat",
@ -151,9 +181,9 @@
{
"DataId": 2001499,
"Position": {
"X": -366.29285,
"Y": -34.989014,
"Z": 293.56824
"X": -366.29285,
"Y": -34.989014,
"Z": 293.56824
},
"TerritoryId": 145,
"InteractionType": "Interact"
@ -166,9 +196,9 @@
{
"DataId": 1001710,
"Position": {
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
"X": -240.2533,
"Y": 18.8,
"Z": 86.900024
},
"TerritoryId": 130,
"InteractionType": "CompleteQuest",

8
QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/350_The Threat of Superiority.json
View File

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

27
QuestPaths/2.x - A Realm Reborn/Class Quests/BLM/353_Facing Your Demons.json
View File

@ -34,19 +34,12 @@
"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,
"TerritoryId": 145,
"InteractionType": "UseItem",
"ItemId": 30362,
"TargetTerritoryId": 140,
"SkipConditions": {
"AetheryteShortcutIf": {
"InSameTerritory": true,
"StepIf": {
"InTerritory": [
140
]
@ -72,6 +65,16 @@
},
"TerritoryId": 140,
"InteractionType": "Interact"
},
{
"DataId": 1004094,
"Position": {
"X": -413.47375,
"Y": 23.113977,
"Z": -383.71863
},
"TerritoryId": 140,
"InteractionType": "Interact"
}
]
},

2
Questionable.Model/Questing/Converter/EmoteConverter.cs
View File

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

2
Questionable.Model/Questing/EEmote.cs
View File

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