Removed commented out code and moved comment to correct location

This commit is contained in:
austinio7116
2018-03-04 06:35:39 +00:00
committed by maustin
parent 73a623cc1b
commit 1b0955b959

View File

@@ -102,11 +102,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
} }
} }
colors = deckColors.getChosenColors(); colors = deckColors.getChosenColors();
/*colors = keyCard.getRules().getColorIdentity();
colors = ColorSet.fromMask(colors.getColor() | keyCard.getRules().getColorIdentity().getColor());
if(secondKeyCard!=null) {
colors = ColorSet.fromMask(colors.getColor() | secondKeyCard.getRules().getColorIdentity().getColor());
}*/
if (logColorsToConsole) { if (logColorsToConsole) {
System.out.println(keyCard.getName()); System.out.println(keyCard.getName());
System.out.println("Pre Colors: " + colors.toEnumSet().toString()); System.out.println("Pre Colors: " + colors.toEnumSet().toString());
@@ -240,6 +236,7 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
addLandKeyCards(); addLandKeyCards();
// 10. Add non-basic lands
List<String> duals = getDualLandList(); List<String> duals = getDualLandList();
addNonBasicLands(); addNonBasicLands();
if (logToConsole) { if (logToConsole) {
@@ -268,7 +265,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
System.out.println("Post Lands : " + deckList.size()); System.out.println("Post Lands : " + deckList.size());
} }
if (keyCard.getRules().getColorIdentity().isColorless()&&landsNeeded>0){ if (keyCard.getRules().getColorIdentity().isColorless()&&landsNeeded>0){
// 10. Add non-basic lands that were drafted.
addWastesIfRequired(); addWastesIfRequired();
} }
fixDeckSize(); fixDeckSize();
@@ -567,11 +563,6 @@ public class CardThemedDeckBuilder extends DeckGeneratorBase {
numColors++; numColors++;
} }
} }
/*if (totalColor == 0) {
for (int j = 0; j < nLand; j++) {
deckList.add(getBasicLand(i));
}
}*/
// do not update landsNeeded until after the loop, because the // do not update landsNeeded until after the loop, because the
// calculation involves landsNeeded // calculation involves landsNeeded