master #3

Open
cacahuetes wants to merge 640 commits from liza/Questionable:master into cacahuetes-ShB-Healer
2 changed files with 57 additions and 19 deletions
Showing only changes of commit 1627d43e4e - Show all commits

View File

@ -21,6 +21,25 @@
{ {
"Sequence": 1, "Sequence": 1,
"Steps": [ "Steps": [
{
"DataId": 1025120,
"Position": {
"X": -333.66907,
"Y": 43.042835,
"Z": -22.201904
},
"TerritoryId": 612,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, null, null, [2], null, null],
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANANA402_03051_Q1_000_000",
"Answer": "TEXT_BANANA402_03051_A1_000_001"
}
]
},
{ {
"DataId": 1025062, "DataId": 1025062,
"Position": { "Position": {
@ -30,6 +49,7 @@
}, },
"TerritoryId": 612, "TerritoryId": 612,
"InteractionType": "Combat", "InteractionType": "Combat",
"RequiredQuestVariables": [null, null, null, [3], null, null],
"Fly": true, "Fly": true,
"DialogueChoices": [ "DialogueChoices": [
{ {
@ -41,6 +61,25 @@
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8587] "KillEnemyDataIds": [8587]
}, },
{
"DataId": 1025119,
"Position": {
"X": -488.18192,
"Y": 81.128265,
"Z": -191.33289
},
"TerritoryId": 612,
"InteractionType": "Interact",
"RequiredQuestVariables": [null, null, null, [2], null, null],
"Fly": true,
"DialogueChoices": [
{
"Type": "List",
"Prompt": "TEXT_BANANA402_03051_Q1_000_000",
"Answer": "TEXT_BANANA402_03051_A1_000_001"
}
]
},
{ {
"DataId": 1025061, "DataId": 1025061,
"Position": { "Position": {
@ -50,11 +89,7 @@
}, },
"TerritoryId": 612, "TerritoryId": 612,
"InteractionType": "Combat", "InteractionType": "Combat",
"SkipConditions": { "RequiredQuestVariables": [null, null, null, [3], null, null],
"StepIf": {
"NotTargetable": true
}
},
"Fly": true, "Fly": true,
"DialogueChoices": [ "DialogueChoices": [
{ {
@ -64,32 +99,28 @@
} }
], ],
"EnemySpawnType": "AfterInteraction", "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8586], "KillEnemyDataIds": [8586]
"$": "This NPC will become an enemy"
}, },
{ {
"DataId": 1025119, "DataId": 1025060,
"Position": { "Position": {
"X": -488.18192, "X": -572.9916,
"Y": 81.128265, "Y": 112.44218,
"Z": -191.33289 "Z": -229.32788
}, },
"TerritoryId": 612, "TerritoryId": 612,
"InteractionType": "Interact", "InteractionType": "Combat",
"SkipConditions": { "RequiredQuestVariables": [null, null, null, [2], null, null],
"StepIf": {
"NotTargetable": true
}
},
"Fly": true, "Fly": true,
"DialogueChoices": [ "DialogueChoices": [
{ {
"Type": "List", "Type": "List",
"Prompt": "TEXT_BANANA402_03051_Q1_000_000", "Prompt": "TEXT_BANANA402_03051_Q1_000_000",
"Answer": "TEXT_BANANA402_03051_A1_000_001" "Answer": "TEXT_BANANA402_03051_A1_000_002"
} }
], ],
"$": "This NPC will not become an enemy" "EnemySpawnType": "AfterInteraction",
"KillEnemyDataIds": [8585]
}, },
{ {
"DataId": 1025118, "DataId": 1025118,
@ -100,6 +131,7 @@
}, },
"TerritoryId": 612, "TerritoryId": 612,
"InteractionType": "Interact", "InteractionType": "Interact",
"RequiredQuestVariables": [null, null, null, [3], null, null],
"Fly": true, "Fly": true,
"DialogueChoices": [ "DialogueChoices": [
{ {
@ -122,6 +154,7 @@
}, },
"TerritoryId": 612, "TerritoryId": 612,
"InteractionType": "WalkTo", "InteractionType": "WalkTo",
"AetheryteShortcut": "Fringes - Peering Stones",
"Fly": true "Fly": true
}, },
{ {

View File

@ -0,0 +1,5 @@
```
0 0 0 x 0 0 |
2 1025120 -> 1025119 -> 1025060
3 1025062 -> 1025061 -> 1025118
```