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

Merge remote-tracking branch 'origin/deckgenimprovements' into deckgenimprovements

Browse Source 
# Conflicts:
#	forge-gui/src/main/java/forge/deck/CardRelationMatrixGenerator.java
#	forge-gui/src/main/java/forge/limited/CardThemedDeckBuilder.java
This commit is contained in:
maustin
2018-03-01 06:55:16 +00:00
parent 352236c390 9aa6990823
commit 02eb8f632f
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui/src/main/java/forge/limited/DeckColors.java
View File

@@ -25,8 +25,8 @@ import forge.item.IPaperCard;
public class DeckColors {
private ColorSet chosen;
private int colorMask;
protected ColorSet chosen;
protected int colorMask;
public int MAX_COLORS = 2;

26
forge-gui/src/main/java/forge/limited/FullDeckColors.java
View File

@@ -1,5 +1,9 @@
package forge.limited;
import forge.card.ColorSet;
import forge.card.MagicColor;
import forge.item.IPaperCard;
/**
* Created by maustin on 11/05/2017.
*/
@@ -7,4 +11,26 @@ public class FullDeckColors extends DeckColors {
public FullDeckColors(){
MAX_COLORS = 5;
}
public void addColorsOf(final IPaperCard pickedCard) {
final ColorSet colorsCanAdd = chosen.inverse();
final ColorSet toAdd = colorsCanAdd.getSharedColors(pickedCard.getRules().getColorIdentity());
int cntColorsAssigned = getChosenColors().countColors();
final boolean haveSpace = cntColorsAssigned < MAX_COLORS;
if (!haveSpace || toAdd.isColorless()) {
return;
}
for (final byte color : MagicColor.WUBRG) {
if (toAdd.hasAnyColor(color)) {
colorMask |= color;
chosen = null; // invalidate color set
cntColorsAssigned++;
}
if (cntColorsAssigned >= MAX_COLORS) {
break;
}
}
}
}