external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 11:48:02 +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

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

@@ -1565,11 +1565,11 @@ public class ComputerUtil {
} }
} }
if (destroy) { if (destroy) {
if(!AllZone.getGameAction().destroy(c)) { if (!AllZone.getGameAction().destroy(c)) {
continue; continue;
} }
} else { } else {
if(!AllZone.getGameAction().sacrifice(c)) { if (!AllZone.getGameAction().sacrifice(c)) {
continue; continue;
} }
} }

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

@@ -3766,7 +3766,8 @@ public class CardFactoryUtil {
for (final String kw : intrinsicKeywords) { for (final String kw : intrinsicKeywords) {
if (kw.startsWith("HIDDEN")) { 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 { } else {
temp.addIntrinsicKeyword(kw); temp.addIntrinsicKeyword(kw);
} }

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

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

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

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