master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
22 changed files with 39 additions and 61 deletions
Showing only changes of commit 15c97d55f7 - Show all commits

View File

@ -13,7 +13,7 @@
"Z": 118.88306 "Z": 118.88306
}, },
"TerritoryId": 131, "TerritoryId": 131,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah", "AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [ "AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza", "[Ul'dah] Aetheryte Plaza",

View File

@ -13,7 +13,7 @@
"Z": 190.41736 "Z": 190.41736
}, },
"TerritoryId": 128, "TerritoryId": 128,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa", "AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [ "AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Aetheryte Plaza",

View File

@ -35,8 +35,7 @@
"Prompt": "TEXT_CLSARM011_00273_Q1_000_1", "Prompt": "TEXT_CLSARM011_00273_Q1_000_1",
"Yes": true "Yes": true
} }
], ]
"NextQuestId": 273
} }
] ]
} }

View File

@ -13,7 +13,7 @@
"Z": 59.952637 "Z": 59.952637
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah", "AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [ "AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza", "[Ul'dah] Aetheryte Plaza",

View File

@ -122,7 +122,7 @@
"TerritoryId": 153, "TerritoryId": 153,
"InteractionType": "CompleteQuest", "InteractionType": "CompleteQuest",
"Fly": true, "Fly": true,
"NextQuestId": 1085 "NextQuestId": 1086
} }
] ]
} }

View File

@ -30,7 +30,7 @@
"DialogueChoices": [ "DialogueChoices": [
{ {
"Type": "YesNo", "Type": "YesNo",
"Prompt": "TEXT_CLSBSM001_00185_Q1_000_1", "Prompt": "TEXT_CLSBSM011_00291_Q1_000_1",
"Yes": true "Yes": true
} }
] ]

View File

@ -35,8 +35,7 @@
"Prompt": "TEXT_CLSHRV001_00003_Q1_000_1", "Prompt": "TEXT_CLSHRV001_00003_Q1_000_1",
"Yes": true "Yes": true
} }
], ]
"NextQuestId": 3
} }
] ]
} }

View File

@ -13,7 +13,7 @@
"Z": -164.0498 "Z": -164.0498
}, },
"TerritoryId": 128, "TerritoryId": 128,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa", "AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [ "AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Aetheryte Plaza",

View File

@ -35,8 +35,7 @@
"Prompt": "TEXT_CLSCUL011_00271_Q1_000_1", "Prompt": "TEXT_CLSCUL011_00271_Q1_000_1",
"Yes": true "Yes": true
} }
], ]
"NextQuestId": 271
} }
] ]
} }

View File

@ -24,7 +24,7 @@
"Yes": true "Yes": true
} }
], ],
"InteractionType": "Interact" "InteractionType": "AcceptQuest"
} }
] ]
} }

View File

@ -13,7 +13,7 @@
"Z": 150.04187 "Z": 150.04187
}, },
"TerritoryId": 129, "TerritoryId": 129,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa", "AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [ "AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Aetheryte Plaza",

View File

@ -38,22 +38,6 @@
"InteractionType": "AcceptQuest" "InteractionType": "AcceptQuest"
} }
] ]
},
{
"Sequence": 255,
"Steps": [
{
"DataId": 1000857,
"Position": {
"X": -165.27051,
"Y": 5.2500057,
"Z": 164.29382
},
"TerritoryId": 129,
"InteractionType": "CompleteQuest",
"NextQuestId": 1108
}
]
} }
] ]
} }

View File

@ -13,7 +13,7 @@
"Z": 97.24573 "Z": 97.24573
}, },
"TerritoryId": 131, "TerritoryId": 131,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah", "AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [ "AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza", "[Ul'dah] Aetheryte Plaza",

View File

@ -35,8 +35,7 @@
"Prompt": "TEXT_CLSGLD011_00608_A1_000_1", "Prompt": "TEXT_CLSGLD011_00608_A1_000_1",
"Yes": true "Yes": true
} }
], ]
"NextQuestId": 608
} }
] ]
} }

View File

@ -35,8 +35,7 @@
"Prompt": "TEXT_CLSTAN000_00105_Q1_000_1", "Prompt": "TEXT_CLSTAN000_00105_Q1_000_1",
"Yes": true "Yes": true
} }
], ]
"NextQuestId": 105
} }
] ]
} }

View File

@ -13,7 +13,7 @@
"Z": -147.41742 "Z": -147.41742
}, },
"TerritoryId": 133, "TerritoryId": 133,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Gridania", "AetheryteShortcut": "Gridania",
"AethernetShortcut": [ "AethernetShortcut": [
"[Gridania] Aetheryte Plaza", "[Gridania] Aetheryte Plaza",

View File

@ -13,7 +13,7 @@
"Z": -51.163513 "Z": -51.163513
}, },
"TerritoryId": 130, "TerritoryId": 130,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah", "AetheryteShortcut": "Ul'dah",
"SkipConditions": { "SkipConditions": {
"AetheryteShortcutIf": { "AetheryteShortcutIf": {

View File

@ -3,9 +3,10 @@
"Author": "Cacahuetes", "Author": "Cacahuetes",
"QuestSequence": [ "QuestSequence": [
{ {
"Sequence": 255, "Sequence": 0,
"Steps": [ "Steps": [
{ "DataId": 1000895, {
"DataId": 1000895,
"Position": { "Position": {
"X": -335.74432, "X": -335.74432,
"Y": 12.899764, "Y": 12.899764,
@ -39,4 +40,3 @@
} }
] ]
} }

View File

@ -13,7 +13,7 @@
"Z": -245.80762 "Z": -245.80762
}, },
"TerritoryId": 128, "TerritoryId": 128,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Limsa Lominsa", "AetheryteShortcut": "Limsa Lominsa",
"AethernetShortcut": [ "AethernetShortcut": [
"[Limsa Lominsa] Aetheryte Plaza", "[Limsa Lominsa] Aetheryte Plaza",

View File

@ -28,7 +28,7 @@
"Z": -255.8786 "Z": -255.8786
}, },
"TerritoryId": 128, "TerritoryId": 128,
"InteractionType": "AcceptQuest", "InteractionType": "CompleteQuest",
"DialogueChoices": [ "DialogueChoices": [
{ {
"Type": "YesNo", "Type": "YesNo",

View File

@ -13,7 +13,7 @@
"Z": 98.039185 "Z": 98.039185
}, },
"TerritoryId": 131, "TerritoryId": 131,
"InteractionType": "Interact", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Ul'dah", "AetheryteShortcut": "Ul'dah",
"AethernetShortcut": [ "AethernetShortcut": [
"[Ul'dah] Aetheryte Plaza", "[Ul'dah] Aetheryte Plaza",

View File

@ -35,8 +35,7 @@
"Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0", "Prompt": "TEXT_CLSWVR011_00534_SYSTEM_Q0",
"Yes": true "Yes": true
} }
], ]
"NextQuestId": 534
} }
] ]
} }