sync with upstreaom #2

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

View File

@ -29,7 +29,12 @@
},
"TerritoryId": 959,
"InteractionType": "WalkTo",
"Comment": "Avoids Combat"
"Comment": "Avoids Combat",
"SkipConditions": {
"StepIf": {
"Flying": "Unlocked"
}
}
},
{
"DataId": 2012531,
@ -40,7 +45,8 @@
},
"TerritoryId": 959,
"InteractionType": "Interact",
"TargetTerritoryId": 1024
"TargetTerritoryId": 1024,
"Fly": true
},
{
"DataId": 1038960,