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

removed non-functional fields and methods from CardRules

Browse Source
This commit is contained in:
Maxmtg
2013-02-20 23:00:48 +00:00
parent 00f945b3db
commit 12ae0de97f
2 changed files with 7 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/java/forge/card/CardRules.java
View File

@@ -19,7 +19,6 @@ package forge.card;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import com.google.common.collect.Lists;
@@ -43,8 +42,6 @@ public final class CardRules implements ICardCharacteristics {
private final ICardCharacteristics otherPart;
private CardAiHints aiHints;
Map<String, CardInSet> setsPrinted = null;
private Iterable<String> forgeScript;
@@ -58,32 +55,6 @@ public final class CardRules implements ICardCharacteristics {
}
/**
* Gets the latest set printed.
*
* @return the latest set printed
*/
public String getLatestSetPrinted() {
String lastSet = null;
// TODO: Make a true release-date based sorting
for (final String cs : this.setsPrinted.keySet()) {
lastSet = cs;
}
return lastSet;
}
/**
* Gets the rarity from latest set.
*
* @return the rarity from latest set
*/
public CardRarity getRarityFromLatestSet() {
final CardInSet cis = this.setsPrinted.get(this.getLatestSetPrinted());
return cis.getRarity();
}
/**
* TODO: Write javadoc for this method.
* @return

59
src/main/java/forge/card/CardRulesPredicates.java
View File

@@ -2,6 +2,9 @@ package forge.card;
import java.util.ArrayList;
import java.util.List;
import java.util.Map.Entry;
import org.apache.commons.lang3.StringUtils;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -222,18 +225,6 @@ public final class CardRulesPredicates {
return new PredicateSuperType(type, isEqual);
}
/**
* Rarity in cards latest set.
*
* @param isEqual
* the is equal
* @param value
* the value
* @return the predicate
*/
public static Predicate<CardRules> rarityInCardsLatestSet(final boolean isEqual, final CardRarity value) {
return new PredicateLastesSetRarity(value, isEqual);
}
/**
* Checks for color.
@@ -444,21 +435,6 @@ public final class CardRulesPredicates {
}
}
private static class PredicateLastesSetRarity implements Predicate<CardRules> {
private final CardRarity operand;
private final boolean shouldBeEqual;
@Override
public boolean apply(final CardRules card) {
return card.getRarityFromLatestSet().equals(this.operand) == this.shouldBeEqual;
}
public PredicateLastesSetRarity(final CardRarity type, final boolean wantEqual) {
this.operand = type;
this.shouldBeEqual = wantEqual;
}
}
private static class PredicateExistsInSets implements Predicate<CardRules> {
private final List<String> sets;
@@ -468,11 +444,10 @@ public final class CardRulesPredicates {
@Override
public boolean apply(final CardRules subject) {
for (final String s : this.sets) {
if (subject.setsPrinted.containsKey(s)) {
for(Entry<String, CardInSet> cs : subject.getSetsPrinted())
for (final String s : this.sets)
if ( StringUtils.equalsIgnoreCase(cs.getKey(), s) )
return true;
}
}
return false;
}
}
@@ -572,27 +547,5 @@ public final class CardRulesPredicates {
Presets.COLORS.add(Presets.IS_GREEN);
Presets.COLORS.add(Presets.IS_COLORLESS);
}
// Think twice before using these, since rarity is a prop of printed
// card.
/** The Constant isInLatestSetCommon. */
public static final Predicate<CardRules> IS_IN_LATEST_SET_COMMON = CardRulesPredicates.rarityInCardsLatestSet(
true, CardRarity.Common);
/** The Constant isInLatestSetUncommon. */
public static final Predicate<CardRules> IS_IN_LATEST_SET_UNCOMMON = CardRulesPredicates
.rarityInCardsLatestSet(true, CardRarity.Uncommon);
/** The Constant isInLatestSetRare. */
public static final Predicate<CardRules> IS_IN_LATEST_SET_RARE = CardRulesPredicates.rarityInCardsLatestSet(
true, CardRarity.Rare);
/** The Constant isInLatestSetMythicRare. */
public static final Predicate<CardRules> IS_IN_LATEST_SET_MYTHIC_RARE = CardRulesPredicates
.rarityInCardsLatestSet(true, CardRarity.MythicRare);
/** The Constant isInLatestSetSpecial. */
public static final Predicate<CardRules> IS_IN_LATEST_SET_SPECIAL = CardRulesPredicates.rarityInCardsLatestSet(
true, CardRarity.Special);
}
}