cacahuetes/Questionable
1
0
Fork 0
forked from liza/Questionable
Code Pull Requests 1 Activity

master #3

Open
cacahuetes wants to merge 695 commits from liza/Questionable:master into cacahuetes-ShB-Healer
pull from: liza/Questionable:master
merge into: cacahuetes:cacahuetes-ShB-Healer
Conversation 0 Commits 695 Files Changed 1585 +42 -6
6 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4c2639ee91 - Show all commits

6
QuestPaths/4.x - Stormblood/Allied Societies/Kojin/Story/2974_Under Wraps.json
View File

@ -53,7 +53,8 @@
}, },
"TerritoryId": 614, "TerritoryId": 614,
"InteractionType": "Snipe", "InteractionType": "Snipe",
"Fly": true "Fly": true,
"Comment": "Snipe Namazu"
} }
] ]
}, },
@ -69,7 +70,8 @@
}, },
"TerritoryId": 614, "TerritoryId": 614,
"InteractionType": "Snipe", "InteractionType": "Snipe",
"Fly": true "Fly": true,
"Comment": "Snipe Namazu"
} }
] ]
}, },

2
QuestPaths/6.x - Endwalker/Aether Currents/Ultima Thule/4354_Combat Evolved.json
View File

@ -51,7 +51,7 @@
}, },
"StopDistance": 0.5, "StopDistance": 0.5,
"TerritoryId": 960, "TerritoryId": 960,
"InteractionType": "WaitForManualProgress", "InteractionType": "Combat",
"EnemySpawnType": "AutoOnEnterArea", "EnemySpawnType": "AutoOnEnterArea",
"KillEnemyDataIds": [ "KillEnemyDataIds": [
14044 14044

5
QuestPaths/6.x - Endwalker/Side Quests/Garlemald/4234_Put Your Plasma Where Your Mouth Is.json
View File

@ -45,7 +45,8 @@
"Z": -296.37604 "Z": -296.37604
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Interact" "InteractionType": "Snipe",
"Comment": "Snipe Magitek Colossi"
} }
] ]
}, },
@ -60,7 +61,7 @@
"Z": -299.36682 "Z": -299.36682
}, },
"TerritoryId": 958, "TerritoryId": 958,
"InteractionType": "Snipe" "InteractionType": "Interact"
} }
] ]
}, },

24
QuestPaths/quest-v1.json
View File

@ -1275,6 +1275,30 @@
"ItemsToGather" "ItemsToGather"
] ]
} }
},
{
"if": {
"properties": {
"InteractionType": {
"anyOf": [
{
"const": "WaitForManualProgress"
},
{
"const": "Instruction"
},
{
"const": "Snipe"
}
]
}
}
},
"then": {
"required": [
"Comment"
]
}
} }
] ]
} }

2
Questionable/Controller/QuestRegistry.cs
View File

@ -144,7 +144,7 @@ internal sealed class QuestRegistry
private void ValidateQuests() private void ValidateQuests()
{ {
_questValidator.Validate(_quests.Values.Where(x => x.Source != Quest.ESource.Assembly)); _questValidator.Validate(_quests.Values.Where(x => x.Source != Quest.ESource.Assembly).ToList());
} }
private void LoadQuestFromStream(string fileName, Stream stream, Quest.ESource source) private void LoadQuestFromStream(string fileName, Stream stream, Quest.ESource source)

9
Questionable/Model/IQuestInfo.cs
View File

@ -25,5 +25,14 @@ internal interface IQuestInfo
public string SimplifiedName => Name public string SimplifiedName => Name
.Replace(".", "", StringComparison.Ordinal) .Replace(".", "", StringComparison.Ordinal)
.Replace("*", "", StringComparison.Ordinal)
.Replace("\"", "", StringComparison.Ordinal)
.Replace("/", "", StringComparison.Ordinal)
.Replace("\\", "", StringComparison.Ordinal)
.Replace("<", "", StringComparison.Ordinal)
.Replace(">", "", StringComparison.Ordinal)
.Replace("|", "", StringComparison.Ordinal)
.Replace(":", "", StringComparison.Ordinal)
.Replace("?", "", StringComparison.Ordinal)
.TrimStart(SeIconChar.QuestSync.ToIconChar(), SeIconChar.QuestRepeatable.ToIconChar(), ' '); .TrimStart(SeIconChar.QuestSync.ToIconChar(), SeIconChar.QuestRepeatable.ToIconChar(), ' ');
} }