sync with upstreaom #2

Open
goatzone wants to merge 545 commits from liza/Questionable:master into master
Showing only changes of commit 756fd155a2 - Show all commits

View File

@ -37,7 +37,12 @@
},
"TerritoryId": 959,
"InteractionType": "WalkTo",
"Fly": true
"Fly": true,
"SkipConditions": {
"StepIf": {
"Flying": "Locked"
}
}
},
{
"DataId": 1044572,
@ -84,4 +89,4 @@
]
}
]
}
}