master #3

Open
cacahuetes wants to merge 653 commits from liza/Questionable:master into cacahuetes-ShB-Healer
6 changed files with 27 additions and 14 deletions
Showing only changes of commit 0a49da1682 - Show all commits

View File

@ -37,7 +37,8 @@
}, },
"TerritoryId": 813, "TerritoryId": 813,
"InteractionType": "Interact", "InteractionType": "Interact",
"AetheryteShortcut": "Lakeland - Fort Jobb" "AetheryteShortcut": "Lakeland - Fort Jobb",
"Fly": true
} }
] ]
}, },

View File

@ -54,7 +54,8 @@
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [10866] "KillEnemyDataIds": [10866],
"Fly": true
} }
] ]
}, },
@ -71,7 +72,8 @@
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [10867] "KillEnemyDataIds": [10867],
"Fly": true
} }
] ]
}, },
@ -86,7 +88,8 @@
"Z": 177.47766 "Z": 177.47766
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Interact" "InteractionType": "Interact",
"Fly": true
} }
] ]
}, },

View File

@ -51,6 +51,7 @@
"Y": 1.4800415, "Y": 1.4800415,
"Z": -282.7345 "Z": -282.7345
}, },
"StopDistance": 4,
"TerritoryId": 815, "TerritoryId": 815,
"InteractionType": "Interact", "InteractionType": "Interact",
"DialogueChoices": [ "DialogueChoices": [
@ -74,7 +75,8 @@
"Z": -36.66742 "Z": -36.66742
}, },
"TerritoryId": 815, "TerritoryId": 815,
"InteractionType": "Interact" "InteractionType": "Interact",
"Fly": true
} }
] ]
}, },
@ -88,6 +90,7 @@
"Y": -25.7535, "Y": -25.7535,
"Z": -35.6604 "Z": -35.6604
}, },
"StopDistance": 4,
"TerritoryId": 815, "TerritoryId": 815,
"InteractionType": "Interact" "InteractionType": "Interact"
} }

View File

@ -54,7 +54,8 @@
"TerritoryId": 817, "TerritoryId": 817,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [10950] "KillEnemyDataIds": [10950],
"Fly": true
} }
] ]
}, },
@ -71,7 +72,8 @@
"TerritoryId": 817, "TerritoryId": 817,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [10869] "KillEnemyDataIds": [10869],
"Fly": true
} }
] ]
}, },
@ -86,7 +88,8 @@
"Z": 59.861084 "Z": 59.861084
}, },
"TerritoryId": 817, "TerritoryId": 817,
"InteractionType": "SinglePlayerDuty" "InteractionType": "SinglePlayerDuty",
"Fly": true
} }
] ]
}, },

View File

@ -52,7 +52,8 @@
"Z": -677.9431 "Z": -677.9431
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Interact" "InteractionType": "Interact",
"Fly": true
} }
] ]
}, },

View File

@ -13,9 +13,8 @@
"Z": -597.1008 "Z": -597.1008
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "CompleteQuest", "InteractionType": "AcceptQuest",
"AetheryteShortcut": "Kholusia - Tomra", "AetheryteShortcut": "Kholusia - Tomra",
"NextQuestId": 3272,
"SkipConditions": { "SkipConditions": {
"AethernetShortcutIf": { "InSameTerritory": true } "AethernetShortcutIf": { "InSameTerritory": true }
} }
@ -35,7 +34,8 @@
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [10870] "KillEnemyDataIds": [10870],
"Fly": true
} }
] ]
}, },
@ -52,7 +52,8 @@
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "Combat", "InteractionType": "Combat",
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [10871] "KillEnemyDataIds": [10871],
"Fly": true
} }
] ]
}, },
@ -67,7 +68,8 @@
"Z": -129.01508 "Z": -129.01508
}, },
"TerritoryId": 814, "TerritoryId": 814,
"InteractionType": "SinglePlayerDuty" "InteractionType": "SinglePlayerDuty",
"Fly": true
} }
] ]
}, },