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

- Checkstyle.

Browse Source
This commit is contained in:
Chris
2011-12-01 13:48:28 +00:00
parent ee677cb060
commit 30f91d6e0a
7 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/forge/ComputerUtil.java
View File

@@ -1537,7 +1537,7 @@ public class ComputerUtil {
for (int i = 0; i < max; i++) {
Card c = null;
if (destroy) {
CardList indestructibles = list.getKeyword("Indestructible");
if (!indestructibles.isEmpty()) {
@@ -1551,9 +1551,9 @@ public class ComputerUtil {
} else {
c = CardFactoryUtil.getWorstPermanentAI(list, true, true, true, true);
}
final ArrayList<Card> auras = c.getEnchantedBy();
if (auras.size() > 0) {
// TODO: choose "worst" controlled enchanting Aura
for (int j = 0; j < auras.size(); j++) {
@@ -1565,11 +1565,11 @@ public class ComputerUtil {
}
}
if (destroy) {
if(!AllZone.getGameAction().destroy(c)) {
if (!AllZone.getGameAction().destroy(c)) {
continue;
}
} else {
if(!AllZone.getGameAction().sacrifice(c)) {
if (!AllZone.getGameAction().sacrifice(c)) {
continue;
}
}

2
src/main/java/forge/card/abilityfactory/AbilityFactorySacrifice.java
View File

@@ -554,7 +554,7 @@ public class AbilityFactorySacrifice {
o = GuiUtils.getChoice("Select a card to sacrifice", list.toArray());
if (o != null) {
final Card c = (Card) o;
if (destroy) {
if (!AllZone.getGameAction().destroy(c)) {
continue;

5
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -3763,10 +3763,11 @@ public class CardFactoryUtil {
// does?
for (int i = 0; i < multiplier; i++) {
Card temp = CardFactoryUtil.copyStats(c);
for (final String kw : intrinsicKeywords) {
if (kw.startsWith("HIDDEN")) {
temp.addExtrinsicKeyword(kw);//extrinsic keywords won't survive the copyStats treatment
temp.addExtrinsicKeyword(kw);
//extrinsic keywords won't survive the copyStats treatment
} else {
temp.addIntrinsicKeyword(kw);
}

2
src/main/java/forge/card/trigger/TriggerHandler.java
View File

@@ -1007,7 +1007,7 @@ public class TriggerHandler {
regtrig.getHostCard().getName()));
buildQuestion.append(")\r\n");
if (sa[0].getTriggeringObjects().containsKey("Attacker")) {
buildQuestion.append("[Attacker: " +sa[0].getTriggeringObjects().get("Attacker") + "]");
buildQuestion.append("[Attacker: " + sa[0].getTriggeringObjects().get("Attacker") + "]");
}
if (!GameActionUtil.showYesNoDialog(regtrig.getHostCard(), buildQuestion.toString())) {
return;

6
src/main/java/forge/deck/generate/Generate2ColorDeck.java
View File

@@ -191,8 +191,8 @@ public class Generate2ColorDeck {
// select cards to build card pools using a mana curve
for (int i = 4; i > 0; i--) {
if (i==1) {
if (i == 1) {
maxCMC[0] = 20; //the last category is open ended
i = 0; // this reduces the number of cards in the last category to 4
}
@@ -201,7 +201,7 @@ public class Generate2ColorDeck {
final CardList sp1CMC = sp1.filter(cmcF);
final CardList sp2CMC = sp2.filter(cmcF);
for (int j = 0; j < i+1; j++) {
for (int j = 0; j < i + 1; j++) {
Card c = cr1CMC.get(this.r.nextInt(cr1CMC.size()));
cr12.add(c);
this.cardCounts.put(c.getName(), 0);

4
src/main/java/forge/deck/generate/Generate3ColorDeck.java
View File

@@ -207,7 +207,7 @@ public class Generate3ColorDeck {
// select cards to build card pools using a mana curve
for (int i = 3; i > 0; i--) {
if (i==1) {
if (i == 1) {
maxCMC[0] = 20; //the last category is open ended
i = 0; // this reduces the number of cards in the last category to 6
}
@@ -219,7 +219,7 @@ public class Generate3ColorDeck {
final CardList sp2CMC = sp2.filter(cmcF);
final CardList sp3CMC = sp3.filter(cmcF);
for (int j = 0; j < i+1; j++) {
for (int j = 0; j < i + 1; j++) {
Card c = cr1CMC.get(this.r.nextInt(cr1CMC.size()));
cr123.add(c);
this.cardCounts.put(c.getName(), 0);

2
src/main/java/forge/deck/generate/Generate5ColorDeck.java
View File

@@ -213,7 +213,7 @@ public class Generate5ColorDeck {
// select cards to build card pools using a mana curve
for (int i = 3; i > 0; i--) {
if (i==1) {
if (i == 1) {
maxCMC[0] = 20; //the last category is open ended
}
final CardList cr1CMC = cr1.filter(cmcF);