github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add/Refactor cards to use SharesCardTypePredicate

Browse source
This commit is contained in:
Daniel Bomar 2022-08-20 12:37:50 -05:00
parent 63bbbcfc81
commit 0f9a293762
No known key found for this signature in database
GPG key ID: C86C8658F4023918
6 changed files with 82 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Mage.Sets/src/mage/cards/b/BraidsArisenNightmare.java
View file

@ -1,9 +1,7 @@
package mage.cards.b;
import java.util.HashSet;
import java.util.UUID;
import mage.MageInt;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
@ -14,12 +12,13 @@ import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SharesCardTypePredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.common.TargetControlledPermanent;
import mage.util.CardUtil;
/**
*
@ -96,8 +95,9 @@ class BraidsArisenNightmareEffect extends OneShotEffect {
if (permanent == null) {
return false;
}
FilterControlledPermanent opponentFilter = new FilterControlledPermanent("a permanent that shares a card type with " + permanent.getName());
opponentFilter.add(new BraidsArisenNightmarePredicate(new HashSet<>(permanent.getCardType(game))));
SharesCardTypePredicate predicate = new SharesCardTypePredicate(permanent.getCardType(game));
FilterControlledPermanent opponentFilter = new FilterControlledPermanent(predicate.toString());
opponentFilter.add(predicate);
if (!permanent.sacrifice(source, game)) {
return false;
}
@ -119,7 +119,7 @@ class BraidsArisenNightmareEffect extends OneShotEffect {
if (!target.canChoose(opponent.getId(), source, game)) {
return false;
}
if (!opponent.chooseUse(Outcome.Sacrifice, "Sacrifice " + opponentFilter.getMessage() + '?', source, game)) {
if (!opponent.chooseUse(Outcome.Sacrifice, "Sacrifice " + CardUtil.addArticle(opponentFilter.getMessage()) + '?', source, game)) {
return false;
}
opponent.chooseTarget(Outcome.Sacrifice, target, source, game);
@ -127,22 +127,3 @@ class BraidsArisenNightmareEffect extends OneShotEffect {
return permanent != null && permanent.sacrifice(source, game);
}
}
class BraidsArisenNightmarePredicate implements Predicate<MageObject> {
private final HashSet<CardType> cardTypes;
public BraidsArisenNightmarePredicate(HashSet<CardType> cardTypes) {
this.cardTypes = cardTypes;
}
@Override
public boolean apply(MageObject input, Game game) {
for (CardType type : input.getCardType(game)) {
if (cardTypes.contains(type)) {
return true;
}
}
return false;
}
}

22
Mage.Sets/src/mage/cards/c/ConfusionInTheRanks.java
View file

@ -13,15 +13,13 @@ import mage.constants.SetTargetPointer;
import mage.constants.Zone;
import mage.filter.FilterPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SharesCardTypePredicate;
import mage.filter.predicate.permanent.ControllerIdPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.TargetPermanent;
import mage.target.targetadjustment.TargetAdjuster;
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
import java.util.UUID;
/**
@ -85,22 +83,12 @@ enum ConfusionInTheRanksAdjuster implements TargetAdjuster {
return;
}
ability.getTargets().clear();
FilterPermanent filterTarget = new FilterPermanent();
String message = "";
SharesCardTypePredicate predicate = new SharesCardTypePredicate(enteringPermanent.getCardType(game));
FilterPermanent filterTarget = new FilterPermanent(predicate.toString() + " you don't control");
filterTarget.add(predicate);
filterTarget.add(Predicates.not(new ControllerIdPredicate(enteringPermanent.getControllerId())));
Set<CardType.CardTypePredicate> cardTypesPredicates = new HashSet<>(1);
for (CardType cardTypeEntering : enteringPermanent.getCardType(game)) {
cardTypesPredicates.add(cardTypeEntering.getPredicate());
if (!message.isEmpty()) {
message += "or ";
}
message += cardTypeEntering.toString().toLowerCase(Locale.ENGLISH) + ' ';
}
filterTarget.add(Predicates.or(cardTypesPredicates));
message += "you don't control";
filterTarget.setMessage(message);
TargetPermanent target = new TargetPermanent(filterTarget);
target.setTargetController(enteringPermanent.getControllerId());
ability.getTargets().add(target);
}
}
}

18
Mage.Sets/src/mage/cards/c/Counterlash.java
View file

@ -1,6 +1,5 @@
package mage.cards.c;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
@ -9,17 +8,14 @@ import mage.cards.CardsImpl;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.filter.FilterCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SharesCardTypePredicate;
import mage.game.Game;
import mage.game.stack.StackObject;
import mage.players.Player;
import mage.target.TargetSpell;
import mage.util.CardUtil;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
/**
* @author BetaSteward
@ -70,17 +66,9 @@ class CounterlashEffect extends OneShotEffect {
if (stackObject == null || controller == null) {
return false;
}
Set<Predicate<MageObject>> predicates = stackObject
.getCardType(game)
.stream()
.map(CardType::getPredicate)
.collect(Collectors.toSet());
game.getStack().counter(source.getFirstTarget(), source, game);
if (predicates.isEmpty()) {
return true;
}
FilterCard filter = new FilterCard();
filter.add(Predicates.or(predicates));
filter.add(new SharesCardTypePredicate(stackObject.getCardType(game)));
game.getStack().counter(source.getFirstTarget(), source, game);
CardUtil.castSpellWithAttributesForFree(controller, source, game, new CardsImpl(controller.getHand()), filter);
return true;
}

23
Mage.Sets/src/mage/cards/m/MartyrsBond.java
View file

@ -10,7 +10,7 @@ import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.mageobject.SharesCardTypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
@ -112,24 +112,9 @@ class MartyrsBondEffect extends OneShotEffect {
Permanent saccedPermanent = getTargetPointer().getFirstTargetPermanentOrLKI(game, source);
Player controller = game.getPlayer(source.getControllerId());
if (controller != null && saccedPermanent != null) {
FilterControlledPermanent filter = new FilterControlledPermanent();
String message = "permanent with type (";
boolean firstType = true;
List<CardType.CardTypePredicate> cardTypes = new ArrayList<>();
for (CardType type : saccedPermanent.getCardType(game)) {
cardTypes.add(type.getPredicate());
if (firstType) {
message += type;
firstType = false;
} else {
message += " or " + type;
}
}
message += ") to sacrifice";
filter.add(Predicates.or(cardTypes));
filter.setMessage(message);
SharesCardTypePredicate predicate = new SharesCardTypePredicate(saccedPermanent.getCardType(game));
FilterControlledPermanent filter = new FilterControlledPermanent(predicate.toString());
filter.add(predicate);
for (UUID playerId : game.getState().getPlayersInRange(controller.getId(), game)) {
Player player = game.getPlayer(playerId);

28
Mage.Sets/src/mage/cards/s/SpiritSistersCall.java
View file

@ -1,9 +1,7 @@
package mage.cards.s;
import java.util.HashSet;
import java.util.UUID;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfYourEndStepTriggeredAbility;
import mage.abilities.common.SimpleStaticAbility;
@ -22,7 +20,7 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.common.FilterControlledPermanent;
import mage.filter.common.FilterPermanentCard;
import mage.filter.predicate.Predicate;
import mage.filter.predicate.mageobject.SharesCardTypePredicate;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.game.events.ZoneChangeEvent;
@ -85,8 +83,9 @@ class SpiritSistersCallDoIfEffect extends OneShotEffect {
if (card == null || game.getState().getZone(targetId) != Zone.GRAVEYARD) {
return false;
}
FilterControlledPermanent filter = new FilterControlledPermanent("a permanent that shares a card type with the chosen card");
filter.add(new SpiritSistersCallPredicate(new HashSet<CardType>(card.getCardType(game))));
SharesCardTypePredicate predicate = new SharesCardTypePredicate(card.getCardType(game));
FilterControlledPermanent filter = new FilterControlledPermanent(predicate.toString());
filter.add(predicate);
return new DoIfCostPaid(new SpiritSistersCallReturnToBattlefieldEffect(), new SacrificeTargetCost(filter)).apply(game, source);
}
}
@ -160,22 +159,3 @@ class SpiritSistersCallReplacementEffect extends ReplacementEffectImpl {
&& zEvent.getFromZone() == Zone.BATTLEFIELD && zEvent.getToZone() != Zone.EXILED;
}
}
class SpiritSistersCallPredicate implements Predicate<MageObject> {
private final HashSet<CardType> cardTypes;
public SpiritSistersCallPredicate(HashSet<CardType> cardTypes) {
this.cardTypes = cardTypes;
}
@Override
public boolean apply(MageObject input, Game game) {
for (CardType type : input.getCardType(game)) {
if (cardTypes.contains(type)) {
return true;
}
}
return false;
}
}

60
Mage/src/main/java/mage/filter/predicate/mageobject/SharesCardTypePredicate.java Normal file
View file

@ -0,0 +1,60 @@
package mage.filter.predicate.mageobject;
import mage.MageObject;
import mage.constants.CardType;
import mage.filter.predicate.Predicate;
import mage.game.Game;
import java.util.Collection;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.Locale;
/**
*
* @author weirddan455
*/
public class SharesCardTypePredicate implements Predicate<MageObject> {
private final LinkedHashSet<CardType> cardTypes;
public SharesCardTypePredicate(Collection<CardType> cardTypes) {
this.cardTypes = new LinkedHashSet<>(cardTypes);
}
@Override
public boolean apply(MageObject input, Game game) {
for (CardType type : input.getCardType(game)) {
if (cardTypes.contains(type)) {
return true;
}
}
return false;
}
@Override
public String toString() {
Iterator<CardType> it = cardTypes.iterator();
switch(cardTypes.size()) {
case 0:
return "";
case 1:
return it.next().toString().toLowerCase(Locale.ENGLISH);
case 2:
return it.next().toString().toLowerCase(Locale.ENGLISH) + " or " + it.next().toString().toLowerCase(Locale.ENGLISH);
default: {
StringBuilder sb = new StringBuilder();
sb.append(it.next().toString().toLowerCase(Locale.ENGLISH));
while (it.hasNext()) {
CardType type = it.next();
sb.append(", ");
if (!it.hasNext()) {
sb.append("or ");
}
sb.append(type.toString().toLowerCase(Locale.ENGLISH));
}
return sb.toString();
}
}
}
}