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

- Rechanged ValidGrave to Valid<AnyZone> count method that was lost in the merge.

Browse Source
This commit is contained in:
moomarc
2012-11-28 05:29:18 +00:00
parent 693a9bc119
commit b4e9c9ec15
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1975,11 +1975,13 @@ public class CardFactoryUtil {
} }
} }
// count valid cards in the garveyard // count valid cards in any specified zone/s
if (l[0].startsWith("ValidGrave")) { if (l[0].startsWith("Valid") && !l[0].contains("Valid ")) {
String restrictions = l[0].replace("ValidGrave ", ""); String[] lparts = l[0].split(" ", 2);
final List<ZoneType> vZone = ZoneType.listValueOf(lparts[0].split("Valid")[1]);
String restrictions = l[0].replace(lparts[0] + " ", "");
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(vZone);
cards = CardLists.getValidCards(cards, rest, cardController, c); cards = CardLists.getValidCards(cards, rest, cardController, c);
n = cards.size(); n = cards.size();