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

make existing "doesNotShareNameWith " more flexible

Browse Source
This commit is contained in:
Northmoc
2022-01-11 13:14:47 -05:00
parent 75a35a3236
commit ae58554d16
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,16 +92,6 @@ public class CardProperty {
} }
} }
} }
} else if (property.startsWith("DifferentName_")) {
Set<String> names = Sets.newHashSet();
for (final Card c : CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), property.substring(14),
sourceController, source, spellAbility)) {
names.add(c.getName());
}
if (names.contains(card.getName())) {
return false;
}
} else if (property.startsWith("BorderColor")) { } else if (property.startsWith("BorderColor")) {
if (!property.toUpperCase().contains(card.borderColor().toString())) { if (!property.toUpperCase().contains(card.borderColor().toString())) {
return false; return false;
@@ -960,6 +950,10 @@ public class CardProperty {
} }
} }
return list.isEmpty(); return list.isEmpty();
} else {
CardCollection list = CardLists.getValidCards(game.getCardsIn(ZoneType.Battlefield), restriction,
sourceController, source, spellAbility);
return !Iterables.any(list, CardPredicates.sharesNameWith(card));
} }
} }
} else if (property.startsWith("sharesControllerWith")) { } else if (property.startsWith("sharesControllerWith")) {