External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix and rework commander validation (fixes #10345)

Browse source
This commit is contained in:
theelk801 2023-05-23 19:25:00 -04:00
parent 85aaaec468
commit fa03c6404f
8 changed files with 145 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

45
Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java
View file

@ -1,11 +1,10 @@
package mage.abilities.keyword;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.cards.Cards;
import mage.cards.CardsImpl;
import mage.constants.Outcome;
import mage.constants.Zone;
@ -17,7 +16,6 @@ import mage.target.TargetPlayer;
import mage.target.common.TargetCardInLibrary;
/**
*
* @author TheElk801
*/
public class PartnerWithAbility extends EntersBattlefieldTriggeredAbility {
@ -73,6 +71,10 @@ public class PartnerWithAbility extends EntersBattlefieldTriggeredAbility {
return partnerName;
}
public boolean checkPartner(Card card) {
return partnerName.equals(card.getName());
}
public static String shortenName(String st) {
StringBuilder sb = new StringBuilder();
for (char s : st.toCharArray()) {
@ -108,29 +110,22 @@ class PartnersWithSearchEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Player player = game.getPlayer(source.getFirstTarget());
if (player != null) {
FilterCard filter = new FilterCard("card named " + partnerName);
filter.add(new NamePredicate(partnerName));
TargetCardInLibrary target = new TargetCardInLibrary(filter);
if (player.chooseUse(Outcome.Benefit, "Search your library for a card named " + partnerName + " and put it into your hand?", source, game)) {
player.searchLibrary(target, source, game);
for (UUID cardId : target.getTargets()) {
Card card = player.getLibrary().getCard(cardId, game);
if (card != null) {
player.revealCards(source, new CardsImpl(card), game);
player.moveCards(card, Zone.HAND, source, game);
}
}
player.shuffleLibrary(source, game);
}
}
// prevent undo
controller.resetStoredBookmark(game);
Player player = game.getPlayer(getTargetPointer().getFirst(game, source));
if (player == null) {
return false;
}
if (!player.chooseUse(Outcome.Benefit, "Search your library for a card named " + partnerName + " and put it into your hand?", source, game)) {
return true;
}
return false;
FilterCard filter = new FilterCard("card named " + partnerName);
filter.add(new NamePredicate(partnerName));
TargetCardInLibrary target = new TargetCardInLibrary(filter);
player.searchLibrary(target, source, game);
Cards cards = new CardsImpl(target.getTargets());
cards.retainZone(Zone.LIBRARY, game);
player.revealCards(source, cards, game);
player.moveCards(cards, Zone.HAND, source, game);
player.shuffleLibrary(source, game);
return true;
}
}

28
Mage/src/main/java/mage/util/validation/ChooseABackgroundValidator.java Normal file
View file

@ -0,0 +1,28 @@
package mage.util.validation;
import mage.abilities.common.ChooseABackgroundAbility;
import mage.cards.Card;
import mage.constants.SubType;
/**
* @author TheElk801
*/
public enum ChooseABackgroundValidator implements CommanderValidator {
instance;
@Override
public boolean checkPartner(Card commander1, Card commander2) {
return commander1.getAbilities().containsClass(ChooseABackgroundAbility.class)
&& commander2.hasSubTypeForDeckbuilding(SubType.BACKGROUND);
}
@Override
public boolean checkBothPartners(Card commander1, Card commander2) {
return checkPartner(commander1, commander2) || checkPartner(commander2, commander1);
}
@Override
public boolean specialCheck(Card commander) {
return commander.hasSubTypeForDeckbuilding(SubType.BACKGROUND);
}
}

21
Mage/src/main/java/mage/util/validation/CommanderValidator.java Normal file
View file

@ -0,0 +1,21 @@
package mage.util.validation;
import mage.cards.Card;
/**
* interface for validating two commanders
*
* @author TheElk801
*/
public interface CommanderValidator {
boolean checkPartner(Card commander1, Card commander2);
default boolean checkBothPartners(Card commander1, Card commander2) {
return checkPartner(commander1, commander2) && checkPartner(commander2, commander1);
}
default boolean specialCheck(Card commander) {
return false;
}
}

16
Mage/src/main/java/mage/util/validation/FriendsForeverValidator.java Normal file
View file

@ -0,0 +1,16 @@
package mage.util.validation;
import mage.abilities.keyword.FriendsForeverAbility;
import mage.cards.Card;
/**
* @author TheElk801
*/
public enum FriendsForeverValidator implements CommanderValidator {
instance;
@Override
public boolean checkPartner(Card commander1, Card commander2) {
return commander1.getAbilities().containsClass(FriendsForeverAbility.class);
}
}

16
Mage/src/main/java/mage/util/validation/PartnerValidator.java Normal file
View file

@ -0,0 +1,16 @@
package mage.util.validation;
import mage.abilities.keyword.PartnerAbility;
import mage.cards.Card;
/**
* @author TheElk801
*/
public enum PartnerValidator implements CommanderValidator {
instance;
@Override
public boolean checkPartner(Card commander1, Card commander2) {
return commander1.getAbilities().containsClass(PartnerAbility.class);
}
}

19
Mage/src/main/java/mage/util/validation/PartnerWithValidator.java Normal file
View file

@ -0,0 +1,19 @@
package mage.util.validation;
import mage.abilities.keyword.PartnerWithAbility;
import mage.cards.Card;
import mage.util.CardUtil;
/**
* @author TheElk801
*/
public enum PartnerWithValidator implements CommanderValidator {
instance;
@Override
public boolean checkPartner(Card commander1, Card commander2) {
return CardUtil
.castStream(commander2.getAbilities().stream(), PartnerWithAbility.class)
.anyMatch(ability -> ability.checkPartner(commander1));
}
}