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

Commander Quest checkstyle and bugfixes

Browse Source 
-QuestEventCommanderDuelManager
Removed unused imports

-CEditorQuest
Fixed colorless cards getting filtered out of deck creation.
This commit is contained in:
Jeremy Pelkala
2018-11-08 11:51:21 -05:00
parent 3dfcf64d30
commit ffcc38d8c4
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuest.java
View File

@@ -322,7 +322,7 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
public boolean apply(PaperCard subject) { public boolean apply(PaperCard subject) {
CardRules cr = subject.getRules(); CardRules cr = subject.getRules();
ManaCost mc = cr.getManaCost(); ManaCost mc = cr.getManaCost();
return !mc.isPureGeneric() && allowedColor.containsAllColorsFrom(cr.getColorIdentity().getColor()); return allowedColor.containsAllColorsFrom(cr.getColorIdentity().getColor());
} }
} }
@@ -336,7 +336,10 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
List<String> colors = new ArrayList<>(); List<String> colors = new ArrayList<>();
//Return early if there are no current commanders //Return early if there are no current commanders
if(commanders.size() == 0) return ColorSet.fromNames(colors); if(commanders.size() == 0){
colors.add("c");
return ColorSet.fromNames(colors);
}
//For each commander,add each color of its color identity if not already added //For each commander,add each color of its color identity if not already added
for(PaperCard pc : commanders){ for(PaperCard pc : commanders){
@@ -347,6 +350,8 @@ public final class CEditorQuest extends CDeckEditor<Deck> {
if(!colors.contains("g") && pc.getRules().getColorIdentity().hasGreen()) colors.add("g"); if(!colors.contains("g") && pc.getRules().getColorIdentity().hasGreen()) colors.add("g");
} }
colors.add("c");
return ColorSet.fromNames(colors); return ColorSet.fromNames(colors);
} }

3
forge-gui/src/main/java/forge/quest/QuestEventCommanderDuelManager.java
View File

@@ -4,10 +4,7 @@ import forge.deck.*;
import forge.item.PaperCard; import forge.item.PaperCard;
import forge.model.FModel; import forge.model.FModel;
import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences;
import forge.util.CollectionSuppliers;
import forge.util.MyRandom; import forge.util.MyRandom;
import forge.util.maps.EnumMapOfLists;
import forge.util.maps.MapOfLists;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;