external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 18:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adventure Updates

Browse Source 
Fix for requiring specific targets for battle objectives.
Small corrections to Island / Mountain capital maps
This commit is contained in:
jjayers99
2023-04-16 07:29:10 -04:00
parent d0a00461ae
commit 04ef8de211
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
forge-gui-mobile/src/forge/adventure/data/AdventureQuestStage.java
View File

@@ -210,13 +210,20 @@ public class AdventureQuestStage implements Serializable {
}
else if (this.objective == AdventureQuestController.ObjectiveTypes.Defeat) {
{
List<String> defeatedTags = Arrays.stream(defeated.getData().questTags).collect(Collectors.toList());
for (String targetTag : enemyTags) {
if (!defeatedTags.contains(targetTag)) {
//Does not count toward objective
return status;
if (mixedEnemies){
List<String> defeatedTags = Arrays.stream(defeated.getData().questTags).collect(Collectors.toList());
for (String targetTag : enemyTags) {
if (!defeatedTags.contains(targetTag)) {
//Does not count toward objective
return status;
}
}
}
else{
if (defeated.getData()!=targetEnemyData)
//Does not count
return status;
}
//All tags matched, kill confirmed
if (++progress1 >= count1){
status = AdventureQuestController.QuestStatus.Complete;