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:
jendave
2011-08-30 07:46:15 +00:00
parent 73f8c055f2
commit 166a86fa9e
4 changed files with 97 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -9507,11 +9507,11 @@ src/main/java/forge/CardFilter.java svneol=native#text/plain
src/main/java/forge/CardList.java svneol=native#text/plain
src/main/java/forge/CardListFilter.java svneol=native#text/plain
src/main/java/forge/CardListUtil.java svneol=native#text/plain
src/main/java/forge/CardPowerToughness.java svneol=native#text/plain
src/main/java/forge/CardReader.java svneol=native#text/plain
src/main/java/forge/CardShopTableModel.java svneol=native#text/plain
src/main/java/forge/CardUtil.java svneol=native#text/plain
src/main/java/forge/Card_Color.java svneol=native#text/plain
src/main/java/forge/Card_PT.java svneol=native#text/plain
src/main/java/forge/Card_Type.java svneol=native#text/plain
src/main/java/forge/Color.java svneol=native#text/plain
src/main/java/forge/ColorChanger.java -text

16
src/main/java/forge/Card.java
View File

@@ -112,7 +112,7 @@ public class Card extends MyObservable implements Comparable<Card> {
private int baseAttack = 0;
private int baseDefense = 0;
private ArrayList<Card_PT> newPT = new ArrayList<Card_PT>(); // stack of set power/toughness
private ArrayList<CardPowerToughness> newPT = new ArrayList<CardPowerToughness>(); // stack of set power/toughness
private int baseLoyalty = 0;
private String baseAttackString = null;
private String baseDefenseString = null;
@@ -3405,7 +3405,7 @@ public class Card extends MyObservable implements Comparable<Card> {
if (newPT.isEmpty())
return -1;
Card_PT latestPT = getLatestPT();
CardPowerToughness latestPT = getLatestPT();
return latestPT.getPower();
}
@@ -3414,16 +3414,16 @@ public class Card extends MyObservable implements Comparable<Card> {
if (newPT.isEmpty())
return -1;
Card_PT latestPT = getLatestPT();
CardPowerToughness latestPT = getLatestPT();
return latestPT.getToughness();
}
public Card_PT getLatestPT() {
Card_PT latestPT = new Card_PT(-1,-1,0);
public CardPowerToughness getLatestPT() {
CardPowerToughness latestPT = new CardPowerToughness(-1,-1,0);
long max = 0;
for (Card_PT pt : newPT) {
for (CardPowerToughness pt : newPT) {
if (pt.getTimestamp() >= max) {
max = pt.getTimestamp();
latestPT = pt;
@@ -3434,12 +3434,12 @@ public class Card extends MyObservable implements Comparable<Card> {
}
public void addNewPT(int power, int toughness, long timestamp) {
newPT.add(new Card_PT(power, toughness, timestamp));
newPT.add(new CardPowerToughness(power, toughness, timestamp));
}
public void removeNewPT(long timestamp) {
for (int i = 0; i < newPT.size(); i++) {
Card_PT cardPT = newPT.get(i);
CardPowerToughness cardPT = newPT.get(i);
if (cardPT.getTimestamp() == timestamp)
newPT.remove(cardPT);
}

24
src/main/java/forge/Card_PT.java → src/main/java/forge/CardPowerToughness.java
View File

@@ -1,12 +1,12 @@
package forge;
/**
* <p>Card_Color class.</p>
* <p>CardPowerToughness class.</p>
*
* @author Forge
* @version $Id$
*/
public class Card_PT {
public class CardPowerToughness {
private int power;
private int toughness;
@@ -17,7 +17,7 @@ public class Card_PT {
*
* @return a long.
*/
public long getTimestamp() {
public final long getTimestamp() {
return timeStamp;
}
@@ -28,17 +28,27 @@ public class Card_PT {
* @param newToughness a int.
* @param stamp a long.
*/
Card_PT(int newPower, int newToughness, long stamp) {
CardPowerToughness(final int newPower, final int newToughness, final long stamp) {
power = newPower;
toughness = newToughness;
timeStamp = stamp;
}
public int getPower() {
/**
*
* Get Power.
* @return int
*/
public final int getPower() {
return power;
}
public int getToughness() {
/**
*
* Get Toughness.
* @return int
*/
public final int getToughness() {
return toughness;
}
@@ -50,7 +60,7 @@ public class Card_PT {
* @param stamp a long.
* @return a boolean.
*/
public boolean equals(int newPower, int newToughness, long stamp) {
public final boolean equals(final int newPower, final int newToughness, final long stamp) {
return timeStamp == stamp && power == newPower && toughness == newToughness;
}
}

81
src/main/java/forge/deck/generate/GenerateDeckUtil.java
View File

@@ -10,81 +10,86 @@ import java.util.ArrayList;
*/
public class GenerateDeckUtil {
/**
*
* Arrays of dual and tri-land cards.
* @param colors a String
* @return ArrayList<String>
*/
public static ArrayList<String> getDualLandList(final String colors) {
public static ArrayList<String> getDualLandList(String colors) {
ArrayList<String> DLands = new ArrayList<String>();
ArrayList<String> dLands = new ArrayList<String>();
if (colors.length() > 3) {
DLands.add("Rupture Spire");
DLands.add("Undiscovered Paradise");
dLands.add("Rupture Spire");
dLands.add("Undiscovered Paradise");
}
if (colors.length() > 2) {
DLands.add("Evolving Wilds");
DLands.add("Terramorphic Expanse");
dLands.add("Evolving Wilds");
dLands.add("Terramorphic Expanse");
}
if (colors.contains("W") && colors.contains("U")) {
DLands.add("Tundra");
DLands.add("Hallowed Fountain");
DLands.add("Flooded Strand");
dLands.add("Tundra");
dLands.add("Hallowed Fountain");
dLands.add("Flooded Strand");
}
if (colors.contains("U") && colors.contains("B")) {
DLands.add("Underground Sea");
DLands.add("Watery Grave");
DLands.add("Polluted Delta");
dLands.add("Underground Sea");
dLands.add("Watery Grave");
dLands.add("Polluted Delta");
}
if (colors.contains("B") && colors.contains("R")) {
DLands.add("Badlands");
DLands.add("Blood Crypt");
DLands.add("Bloodstained Mire");
dLands.add("Badlands");
dLands.add("Blood Crypt");
dLands.add("Bloodstained Mire");
}
if (colors.contains("R") && colors.contains("G")) {
DLands.add("Taiga");
DLands.add("Stomping Ground");
DLands.add("Wooded Foothills");
dLands.add("Taiga");
dLands.add("Stomping Ground");
dLands.add("Wooded Foothills");
}
if (colors.contains("G") && colors.contains("W")) {
DLands.add("Savannah");
DLands.add("Temple Garden");
DLands.add("Windswept Heath");
dLands.add("Savannah");
dLands.add("Temple Garden");
dLands.add("Windswept Heath");
}
if (colors.contains("W") && colors.contains("B")) {
DLands.add("Scrubland");
DLands.add("Godless Shrine");
DLands.add("Marsh Flats");
dLands.add("Scrubland");
dLands.add("Godless Shrine");
dLands.add("Marsh Flats");
}
if (colors.contains("U") && colors.contains("R")) {
DLands.add("Volcanic Island");
DLands.add("Steam Vents");
DLands.add("Scalding Tarn");
dLands.add("Volcanic Island");
dLands.add("Steam Vents");
dLands.add("Scalding Tarn");
}
if (colors.contains("B") && colors.contains("G")) {
DLands.add("Bayou");
DLands.add("Overgrown Tomb");
DLands.add("Verdant Catacombs");
dLands.add("Bayou");
dLands.add("Overgrown Tomb");
dLands.add("Verdant Catacombs");
}
if (colors.contains("R") && colors.contains("W")) {
DLands.add("Plateau");
DLands.add("Sacred Foundry");
DLands.add("Arid Mesa");
dLands.add("Plateau");
dLands.add("Sacred Foundry");
dLands.add("Arid Mesa");
}
if (colors.contains("G") && colors.contains("U")) {
DLands.add("Tropical Island");
DLands.add("Breeding Pool");
DLands.add("Misty Rainforest");
dLands.add("Tropical Island");
dLands.add("Breeding Pool");
dLands.add("Misty Rainforest");
}
return DLands;
return dLands;
}
}