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

CardProperty: make sharesCreatureTypeWith use DefinedCard

Browse Source
This commit is contained in:
Hans Mackowiak
2021-02-25 17:08:49 +01:00
parent 96532309ce
commit 8ccbffce48
18 changed files with 51 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -140,6 +140,7 @@ public class CardFactory {
c.clearControllers();
c.setOwner(controller);
c.setCopiedSpell(true);
c.setCopiedPermanent(original);
c.setXManaCostPaidByColor(original.getXManaCostPaidByColor());
c.setKickerMagnitude(original.getKickerMagnitude());

9
forge-game/src/main/java/forge/game/card/CardPredicates.java
View File

@@ -162,6 +162,15 @@ public final class CardPredicates {
};
}
public static Predicate<Card> sharesCardTypeWith(final Card card) {
return new Predicate<Card>() {
@Override
public boolean apply(final Card c) {
return c.sharesCardTypeWith(card);
}
};
}
public static Predicate<Card> sharesCreatureTypeWith(final Card card) {
return new Predicate<Card>() {
@Override

63
forge-game/src/main/java/forge/game/card/CardProperty.java
View File

@@ -789,12 +789,6 @@ public class CardProperty {
} else {
final String restriction = property.split("sharesCreatureTypeWith ")[1];
switch (restriction) {
case "TopCardOfLibrary":
final CardCollectionView cards = sourceController.getCardsIn(ZoneType.Library);
if (cards.isEmpty() || !card.sharesCreatureTypeWith(cards.get(0))) {
return false;
}
break;
case "Commander":
final List<Card> cmdrs = sourceController.getCommanders();
for (Card cmdr : cmdrs) {
@@ -803,35 +797,6 @@ public class CardProperty {
}
}
return false;
case "Enchanted":
for (final SpellAbility sa : source.getCurrentState().getNonManaAbilities()) {
final SpellAbility root = sa.getRootAbility();
Card c = source.getEnchantingCard();
if ((c == null) && (root != null)
&& (root.getPaidList("Sacrificed") != null)
&& !root.getPaidList("Sacrificed").isEmpty()) {
c = root.getPaidList("Sacrificed").get(0).getEnchantingCard();
if (!card.sharesCreatureTypeWith(c)) {
return false;
}
}
}
break;
case "Equipped":
if (source.isEquipping() && card.sharesCreatureTypeWith(source.getEquipping())) {
return true;
}
return false;
case "Remembered":
for (final Object rem : source.getRemembered()) {
if (rem instanceof Card) {
final Card c = (Card) rem;
if (card.sharesCreatureTypeWith(c)) {
return true;
}
}
}
return false;
case "AllRemembered":
for (final Object rem : source.getRemembered()) {
if (rem instanceof Card) {
@@ -843,13 +808,7 @@ public class CardProperty {
}
break;
default:
boolean shares = false;
for (final Card c : sourceController.getCardsIn(ZoneType.Battlefield)) {
if (c.isValid(restriction, sourceController, source, spellAbility) && card.sharesCreatureTypeWith(c)) {
shares = true;
}
}
if (!shares) {
if (!Iterables.any(AbilityUtils.getDefinedCards(source, restriction, spellAbility), CardPredicates.sharesCreatureTypeWith(card))) {
return false;
}
break;
@@ -891,15 +850,9 @@ public class CardProperty {
}
return false;
default:
final CardCollection cards1 = AbilityUtils.getDefinedCards(card, restriction, spellAbility);
if (cards1.isEmpty()) {
if (!Iterables.any(AbilityUtils.getDefinedCards(source, restriction, spellAbility), CardPredicates.sharesCardTypeWith(card))) {
return false;
}
for (Card c : cards1) {
if (!card.sharesCardTypeWith(c)) {
return false;
}
}
}
}
} else if (property.equals("sharesPermanentTypeWith")) {
@@ -935,9 +888,6 @@ public class CardProperty {
return !CardLists.filter(game.getCardsIn(ZoneType.Battlefield), CardPredicates.sharesNameWith(card)).isEmpty();
} else if (restriction.equals("ThisTurnCast")) {
return !CardLists.filter(CardUtil.getThisTurnCast("Card", source), CardPredicates.sharesNameWith(card)).isEmpty();
} else if (restriction.startsWith("Remembered") || restriction.startsWith("Imprinted")) {
CardCollection list = AbilityUtils.getDefinedCards(source, restriction, spellAbility);
return !CardLists.filter(list, CardPredicates.sharesNameWith(card)).isEmpty();
} else if (restriction.equals("MovedToGrave")) {
for (final SpellAbility sa : source.getCurrentState().getNonManaAbilities()) {
final SpellAbility root = sa.getRootAbility();
@@ -969,6 +919,10 @@ public class CardProperty {
}
}
return false;
} else {
if (!Iterables.any(AbilityUtils.getDefinedCards(source, restriction, spellAbility), CardPredicates.sharesNameWith(card))) {
return false;
}
}
}
} else if (property.startsWith("doesNotShareNameWith")) {
@@ -1859,6 +1813,11 @@ public class CardProperty {
if (card.equals(obj)) {
return false;
}
} else if (property.startsWith("NotDefined")) {
final String key = property.substring("NotDefined".length());
if (Iterables.contains(AbilityUtils.getDefinedCards(source, key, spellAbility), card)) {
return false;
}
} else if (property.equals("CanPayManaCost")) {
final class CheckCanPayManaCost {
private List<Mana> manaPaid;