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

- Cleanup of xCount.

Browse Source
This commit is contained in:
Sloth
2012-11-26 19:36:27 +00:00
parent f51439aeac
commit 2f2f4a4bcf
1 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1764,8 +1764,8 @@ public class CardFactoryUtil {
int n = 0; int n = 0;
// count valid cards on the battlefield // count valid cards on the battlefield
if (l[0].contains("Valid")) { if (l[0].startsWith("Valid")) {
final String restrictions = l[0].replace("Valid ", ""); final String restrictions = l[0].substring(6);
final String[] rest = restrictions.split(","); final String[] rest = restrictions.split(",");
List<Card> cardsonbattlefield = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield); List<Card> cardsonbattlefield = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield);
cardsonbattlefield = CardLists.getValidCards(cardsonbattlefield, rest, players.get(0), source); cardsonbattlefield = CardLists.getValidCards(cardsonbattlefield, rest, players.get(0), source);
@@ -1954,8 +1954,8 @@ public class CardFactoryUtil {
final String[] m = CardFactoryUtil.parseMath(l); final String[] m = CardFactoryUtil.parseMath(l);
// accept straight numbers // accept straight numbers
if (l[0].contains("Number$")) { if (l[0].startsWith("Number$")) {
final String number = l[0].replace("Number$", ""); final String number = l[0].substring(7);
if (number.equals("ChosenNumber")) { if (number.equals("ChosenNumber")) {
return CardFactoryUtil.doXMath(c.getChosenNumber(), m, c); return CardFactoryUtil.doXMath(c.getChosenNumber(), m, c);
} else { } else {
@@ -1964,16 +1964,16 @@ public class CardFactoryUtil {
} }
if (l[0].startsWith("Count$")) { if (l[0].startsWith("Count$")) {
l[0] = l[0].replace("Count$", ""); l[0] = l[0].substring(6);
} }
if (l[0].startsWith("SVar$")) { if (l[0].startsWith("SVar$")) {
final String sVar = l[0].replace("SVar$", ""); final String sVar = l[0].substring(5);
return CardFactoryUtil.doXMath(CardFactoryUtil.xCount(c, c.getSVar(sVar)), m, c); return CardFactoryUtil.doXMath(CardFactoryUtil.xCount(c, c.getSVar(sVar)), m, c);
} }
// Manapool // Manapool
if (l[0].contains("ManaPool")) { if (l[0].startsWith("ManaPool")) {
final String color = l[0].split(":")[1]; final String color = l[0].split(":")[1];
if (color.equals("All")) { if (color.equals("All")) {
return c.getController().getManaPool().totalMana(); return c.getController().getManaPool().totalMana();
@@ -1983,9 +1983,8 @@ public class CardFactoryUtil {
} }
// count valid cards in the garveyard // count valid cards in the garveyard
if (l[0].contains("ValidGrave")) { if (l[0].startsWith("ValidGrave")) {
String restrictions = l[0].replace("ValidGrave ", ""); String restrictions = l[0].replace("ValidGrave ", "");
restrictions = restrictions.replace("Count$", "");
final String[] rest = restrictions.split(","); final String[] rest = restrictions.split(",");
List<Card> cards = Singletons.getModel().getGame().getCardsIn(ZoneType.Graveyard); List<Card> cards = Singletons.getModel().getGame().getCardsIn(ZoneType.Graveyard);
cards = CardLists.getValidCards(cards, rest, cardController, c); cards = CardLists.getValidCards(cards, rest, cardController, c);
@@ -1995,9 +1994,8 @@ public class CardFactoryUtil {
return CardFactoryUtil.doXMath(n, m, c); return CardFactoryUtil.doXMath(n, m, c);
} }
// count valid cards on the battlefield // count valid cards on the battlefield
if (l[0].contains("Valid")) { if (l[0].startsWith("Valid")) {
String restrictions = l[0].replace("Valid ", ""); String restrictions = l[0].substring(6);
restrictions = restrictions.replace("Count$", "");
final String[] rest = restrictions.split(","); final String[] rest = restrictions.split(",");
List<Card> cardsonbattlefield = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield); List<Card> cardsonbattlefield = Singletons.getModel().getGame().getCardsIn(ZoneType.Battlefield);
cardsonbattlefield = CardLists.getValidCards(cardsonbattlefield, rest, cardController, c); cardsonbattlefield = CardLists.getValidCards(cardsonbattlefield, rest, cardController, c);
@@ -2007,25 +2005,25 @@ public class CardFactoryUtil {
return CardFactoryUtil.doXMath(n, m, c); return CardFactoryUtil.doXMath(n, m, c);
} }
if (l[0].contains("ImprintedCardPower")) { if (l[0].startsWith("ImprintedCardPower")) {
if (c.getImprinted().size() > 0) { if (c.getImprinted().size() > 0) {
return c.getImprinted().get(0).getNetAttack(); return c.getImprinted().get(0).getNetAttack();
} }
} }
if (l[0].contains("ImprintedCardToughness")) { if (l[0].startsWith("ImprintedCardToughness")) {
if (c.getImprinted().size() > 0) { if (c.getImprinted().size() > 0) {
return c.getImprinted().get(0).getNetDefense(); return c.getImprinted().get(0).getNetDefense();
} }
} }
if (l[0].contains("ImprintedCardManaCost")) { if (l[0].startsWith("ImprintedCardManaCost")) {
if (c.getImprinted().get(0).getCMC() > 0) { if (c.getImprinted().get(0).getCMC() > 0) {
return c.getImprinted().get(0).getCMC(); return c.getImprinted().get(0).getCMC();
} }
} }
if (l[0].contains("GreatestPowerYouControl")) { if (l[0].startsWith("GreatestPowerYouControl")) {
final List<Card> list = c.getController().getCreaturesInPlay(); final List<Card> list = c.getController().getCreaturesInPlay();
int highest = 0; int highest = 0;
for (final Card crd : list) { for (final Card crd : list) {
@@ -2036,7 +2034,7 @@ public class CardFactoryUtil {
return highest; return highest;
} }
if (l[0].contains("GreatestPowerYouDontControl")) { if (l[0].startsWith("GreatestPowerYouDontControl")) {
final List<Card> list = c.getController().getOpponent().getCreaturesInPlay(); final List<Card> list = c.getController().getOpponent().getCreaturesInPlay();
int highest = 0; int highest = 0;
for (final Card crd : list) { for (final Card crd : list) {
@@ -2047,7 +2045,7 @@ public class CardFactoryUtil {
return highest; return highest;
} }
if (l[0].contains("HighestCMCRemembered")) { if (l[0].startsWith("HighestCMCRemembered")) {
final List<Card> list = new ArrayList<Card>(); final List<Card> list = new ArrayList<Card>();
int highest = 0; int highest = 0;
for (final Object o : c.getRemembered()) { for (final Object o : c.getRemembered()) {
@@ -2063,17 +2061,7 @@ public class CardFactoryUtil {
return highest; return highest;
} }
if (l[0].contains("RememberedSumPower")) { if (l[0].startsWith("RememberedSize")) {
final List<Card> list = new ArrayList<Card>();
for (final Object o : c.getRemembered()) {
if (o instanceof Card) {
list.add(Singletons.getModel().getGame().getCardState((Card) o));
}
}
return Aggregates.sum(Iterables.filter(list, CardPredicates.Presets.hasSecondStrike), CardPredicates.Accessors.fnGetAttack);
}
if (l[0].contains("RememberedSize")) {
return c.getRemembered().size(); return c.getRemembered().size();
} }
@@ -2862,10 +2850,10 @@ public class CardFactoryUtil {
} }
} }
if (string.contains("Valid")) { if (string.startsWith("Valid")) {
final String[] m = { "none" }; final String[] m = { "none" };
String valid = string.replace("Valid ", ""); String valid = string.substring(6);
final String[] l; final String[] l;
l = valid.split("/"); // separate the specification from any math l = valid.split("/"); // separate the specification from any math
valid = l[0]; valid = l[0];