forked from liza/Questionable
Merge branch 'ananta'
This commit is contained in:
commit
c981d57055
@ -35,7 +35,8 @@
|
||||
8578,
|
||||
8579,
|
||||
8580
|
||||
]
|
||||
],
|
||||
"Fly": true
|
||||
}
|
||||
]
|
||||
},
|
||||
|
@ -21,6 +21,25 @@
|
||||
{
|
||||
"Sequence": 1,
|
||||
"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,
|
||||
"Position": {
|
||||
@ -30,6 +49,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Combat",
|
||||
"RequiredQuestVariables": [null, null, null, [3], null, null],
|
||||
"Fly": true,
|
||||
"DialogueChoices": [
|
||||
{
|
||||
@ -41,6 +61,25 @@
|
||||
"EnemySpawnType": "AfterInteraction",
|
||||
"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,
|
||||
"Position": {
|
||||
@ -50,11 +89,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Combat",
|
||||
"SkipConditions": {
|
||||
"StepIf": {
|
||||
"NotTargetable": true
|
||||
}
|
||||
},
|
||||
"RequiredQuestVariables": [null, null, null, [3], null, null],
|
||||
"Fly": true,
|
||||
"DialogueChoices": [
|
||||
{
|
||||
@ -64,32 +99,28 @@
|
||||
}
|
||||
],
|
||||
"EnemySpawnType": "AfterInteraction",
|
||||
"KillEnemyDataIds": [8586],
|
||||
"$": "This NPC will become an enemy"
|
||||
"KillEnemyDataIds": [8586]
|
||||
},
|
||||
{
|
||||
"DataId": 1025119,
|
||||
"DataId": 1025060,
|
||||
"Position": {
|
||||
"X": -488.18192,
|
||||
"Y": 81.128265,
|
||||
"Z": -191.33289
|
||||
"X": -572.9916,
|
||||
"Y": 112.44218,
|
||||
"Z": -229.32788
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Interact",
|
||||
"SkipConditions": {
|
||||
"StepIf": {
|
||||
"NotTargetable": true
|
||||
}
|
||||
},
|
||||
"InteractionType": "Combat",
|
||||
"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"
|
||||
"Answer": "TEXT_BANANA402_03051_A1_000_002"
|
||||
}
|
||||
],
|
||||
"$": "This NPC will not become an enemy"
|
||||
"EnemySpawnType": "AfterInteraction",
|
||||
"KillEnemyDataIds": [8585]
|
||||
},
|
||||
{
|
||||
"DataId": 1025118,
|
||||
@ -100,6 +131,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Interact",
|
||||
"RequiredQuestVariables": [null, null, null, [3], null, null],
|
||||
"Fly": true,
|
||||
"DialogueChoices": [
|
||||
{
|
||||
@ -122,6 +154,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "WalkTo",
|
||||
"AetheryteShortcut": "Fringes - Peering Stones",
|
||||
"Fly": true
|
||||
},
|
||||
{
|
||||
|
@ -0,0 +1,5 @@
|
||||
```
|
||||
0 0 0 x 0 0 |
|
||||
2 1025120 -> 1025119 -> 1025060
|
||||
3 1025062 -> 1025061 -> 1025118
|
||||
```
|
@ -21,6 +21,32 @@
|
||||
{
|
||||
"Sequence": 1,
|
||||
"Steps": [
|
||||
{
|
||||
"DataId": 1025066,
|
||||
"Position": {
|
||||
"X": -155.90149,
|
||||
"Y": 66.2623,
|
||||
"Z": -366.93372
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Emote",
|
||||
"Emote": "rally",
|
||||
"Fly": true,
|
||||
"RequiredQuestVariables": [null, null, [16], null, null, null]
|
||||
},
|
||||
{
|
||||
"DataId": 1025064,
|
||||
"Position": {
|
||||
"X": 185.62585,
|
||||
"Y": 68.93902,
|
||||
"Z": -372.15234
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Emote",
|
||||
"RequiredQuestVariables": [null, [1, 17], null, null, null, null],
|
||||
"Emote": "soothe",
|
||||
"Fly": true
|
||||
},
|
||||
{
|
||||
"DataId": 1025063,
|
||||
"Position": {
|
||||
@ -30,6 +56,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Emote",
|
||||
"RequiredQuestVariables": [null, [2, 18], null, null, null, null],
|
||||
"Emote": "soothe",
|
||||
"Fly": true
|
||||
},
|
||||
@ -42,6 +69,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "Emote",
|
||||
"RequiredQuestVariables": [null, null, [32], null, null, null],
|
||||
"Emote": "rally",
|
||||
"Fly": true
|
||||
}
|
||||
@ -58,6 +86,7 @@
|
||||
},
|
||||
"TerritoryId": 612,
|
||||
"InteractionType": "WalkTo",
|
||||
"AetheryteShortcut": "Fringes - Peering Stones",
|
||||
"Fly": true
|
||||
},
|
||||
{
|
||||
|
@ -0,0 +1,7 @@
|
||||
```
|
||||
0 0 x x 0 0 | 1025063 1025064 1025065 1025066
|
||||
1 16 x x
|
||||
2 16 x x
|
||||
1 32 x x
|
||||
2 32 x x
|
||||
```
|
@ -876,6 +876,7 @@
|
||||
"Form Shift",
|
||||
"Buffet (Sanuwa)",
|
||||
"Buffet (Griffin)",
|
||||
"Trample",
|
||||
"Fumigate",
|
||||
"Siphon Snout",
|
||||
"Cannonfire",
|
||||
|
@ -21,6 +21,7 @@ public sealed class ActionConverter() : EnumConverter<EAction>(Values)
|
||||
{ EAction.FormShift, "Form Shift" },
|
||||
{ EAction.BuffetSanuwa, "Buffet (Sanuwa)" },
|
||||
{ EAction.BuffetGriffin, "Buffet (Griffin)" },
|
||||
{ EAction.Trample, "Trample" },
|
||||
{ EAction.Fumigate, "Fumigate" },
|
||||
{ EAction.SiphonSnout, "Siphon Snout" },
|
||||
{ EAction.Cannonfire, "Cannonfire" },
|
||||
|
@ -20,6 +20,7 @@ public enum EAction
|
||||
FormShift = 4262,
|
||||
BuffetSanuwa = 4931,
|
||||
BuffetGriffin = 4583,
|
||||
Trample = 4585,
|
||||
Fumigate = 5872,
|
||||
MagitekPulse = 8624,
|
||||
MagitekThunder = 8625,
|
||||
@ -56,6 +57,7 @@ public static class EActionExtensions
|
||||
return action
|
||||
is EAction.BuffetSanuwa
|
||||
or EAction.BuffetGriffin
|
||||
or EAction.Trample
|
||||
or EAction.Fumigate
|
||||
or EAction.SiphonSnout
|
||||
or EAction.Cannonfire
|
||||
|
Loading…
Reference in New Issue
Block a user