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

more refactoring

Browse source
This commit is contained in:
theelk801 2024-10-08 11:18:49 -04:00
parent e0f031801d
commit a9ef69885e
23 changed files with 432 additions and 405 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/MageObject.java
View file

@ -624,6 +624,10 @@ public interface MageObject extends MageItem, Serializable, Copyable<MageObject>
boolean hasName(String name, Game game);
default boolean hasNoName(Game game) {
return false;
}
default boolean sharesName(MageObject mageObject, Game game) {
return !mageObject.getName().isEmpty() && hasName(mageObject.getName(), game);
}

23
Mage/src/main/java/mage/abilities/assignment/common/NameAssignment.java Normal file
View file

@ -0,0 +1,23 @@
package mage.abilities.assignment.common;
import mage.abilities.assignment.RoleAssignment;
import mage.cards.Card;
import mage.game.Game;
import java.util.Set;
import java.util.stream.Collectors;
public class NameAssignment extends RoleAssignment<String> {
public NameAssignment(String... names) {
super(names);
}
@Override
protected Set<String> makeSet(Card card, Game game) {
return attributes
.stream()
.filter(s -> card.hasName(s, game))
.collect(Collectors.toSet());
}
}

6
Mage/src/main/java/mage/abilities/effects/common/ExileTargetCardCopyAndCastEffect.java
View file

@ -48,10 +48,12 @@ public class ExileTargetCardCopyAndCastEffect extends OneShotEffect {
if (player == null || card == null) {
return false;
}
player.moveCards(card, Zone.EXILED, source, game);
if (!Zone.EXILED.match(game.getState().getZone(card.getId()))) {
player.moveCards(card, Zone.EXILED, source, game);
}
Card cardCopy = game.copyCard(card, source, source.getControllerId());
if (optional && !player.chooseUse(outcome, "Cast copy of " +
card.getName() + (this.noMana ? " without paying its mana cost?" : "?" ), source, game)) {
card.getName() + (this.noMana ? " without paying its mana cost?" : "?"), source, game)) {
return true;
}
game.getState().setValue("PlayFromNotOwnHandZone" + cardCopy.getId(), Boolean.TRUE);

111
Mage/src/main/java/mage/abilities/effects/common/search/SearchTargetGraveyardHandLibraryForCardNameAndExileEffect.java
View file

@ -1,5 +1,6 @@
package mage.abilities.effects.common.search;
import mage.MageObject;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Cards;
@ -8,6 +9,7 @@ import mage.constants.Outcome;
import mage.constants.Zone;
import mage.filter.FilterCard;
import mage.filter.predicate.mageobject.NamePredicate;
import mage.filter.predicate.mageobject.SharesNamePredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.TargetCard;
@ -40,6 +42,7 @@ public abstract class SearchTargetGraveyardHandLibraryForCardNameAndExileEffect
protected SearchTargetGraveyardHandLibraryForCardNameAndExileEffect(boolean graveyardExileOptional, String searchWhatText, String searchForText, boolean drawForEachHandCard) {
this(graveyardExileOptional, searchWhatText, searchForText, drawForEachHandCard, Integer.MAX_VALUE);
}
protected SearchTargetGraveyardHandLibraryForCardNameAndExileEffect(boolean graveyardExileOptional, String searchWhatText, String searchForText, boolean drawForEachHandCard, int maxAmount) {
super(Outcome.Exile);
this.searchWhatText = searchWhatText;
@ -69,59 +72,67 @@ public abstract class SearchTargetGraveyardHandLibraryForCardNameAndExileEffect
* @return
*/
protected boolean applySearchAndExile(Game game, Ability source, String cardName, UUID targetPlayerId) {
FilterCard filter = new FilterCard("card named \"" + cardName + "\"");
filter.add(new NamePredicate(cardName));
return applySearchAndExile(game, source, filter, targetPlayerId);
}
protected boolean applySearchAndExile(Game game, Ability source, MageObject mageObject, UUID targetPlayerId) {
FilterCard filter = new FilterCard("card that shares a name with " + mageObject.getName());
filter.add(new SharesNamePredicate(mageObject));
return applySearchAndExile(game, source, filter, targetPlayerId);
}
private boolean applySearchAndExile(Game game, Ability source, FilterCard filter, UUID targetPlayerId) {
Player controller = game.getPlayer(source.getControllerId());
if (cardName != null && controller != null) {
Player targetPlayer = game.getPlayer(targetPlayerId);
if (targetPlayer != null) {
int handCards = 0;
int maxRemaining = maxAmount;
FilterCard filter = new FilterCard("card named \"" + cardName + "\"");
filter.add(new NamePredicate(cardName));
// cards in Graveyard
int cardsCount = Math.min(targetPlayer.getGraveyard().count(filter, game), maxRemaining);
if (cardsCount > 0) {
filter.setMessage("card named " + cardName + " in the graveyard of " + targetPlayer.getName());
TargetCard target = new TargetCard((graveyardExileOptional ? 0 : cardsCount), cardsCount, Zone.GRAVEYARD, filter);
target.withNotTarget(true);
if (controller.choose(Outcome.Exile, targetPlayer.getGraveyard(), target, source, game)) {
maxRemaining -= target.getTargets().size();
controller.moveCards(new CardsImpl(target.getTargets()), Zone.EXILED, source, game);
}
}
// cards in Hand
cardsCount = Math.min(targetPlayer.getHand().count(filter, game), maxRemaining);
filter.setMessage("card named " + cardName + " in the hand of " + targetPlayer.getName());
TargetCard target = new TargetCard(0, cardsCount, Zone.HAND, filter);
target.withNotTarget(true);
if (controller.choose(Outcome.Exile, targetPlayer.getHand(), target, source, game)) {
maxRemaining -= target.getTargets().size();
if (drawForEachHandCard) {
handCards = target.getTargets().size();
}
controller.moveCards(new CardsImpl(target.getTargets()), Zone.EXILED, source, game);
}
// cards in Library
Cards cardsInLibrary = new CardsImpl();
cardsInLibrary.addAllCards(targetPlayer.getLibrary().getCards(game));
cardsCount = Math.min(cardsInLibrary.count(filter, game), maxRemaining);
filter.setMessage("card named " + cardName + " in the library of " + targetPlayer.getLogName());
TargetCardInLibrary targetLib = new TargetCardInLibrary(0, cardsCount, filter);
if (controller.choose(Outcome.Exile, cardsInLibrary, targetLib, source, game)) {
controller.moveCards(new CardsImpl(targetLib.getTargets()), Zone.EXILED, source, game);
}
targetPlayer.shuffleLibrary(source, game);
if (handCards > 0) {
targetPlayer.drawCards(handCards, source, game);
}
Player targetPlayer = game.getPlayer(targetPlayerId);
if (controller == null || targetPlayer == null) {
return false;
}
String message = filter.getMessage();
int handCards = 0;
int maxRemaining = maxAmount;
// cards in Graveyard
int cardsCount = Math.min(targetPlayer.getGraveyard().count(filter, game), maxRemaining);
if (cardsCount > 0) {
filter.setMessage(message + " in the graveyard of " + targetPlayer.getName());
TargetCard target = new TargetCard((graveyardExileOptional ? 0 : cardsCount), cardsCount, Zone.GRAVEYARD, filter);
target.withNotTarget(true);
if (controller.choose(Outcome.Exile, targetPlayer.getGraveyard(), target, source, game)) {
maxRemaining -= target.getTargets().size();
controller.moveCards(new CardsImpl(target.getTargets()), Zone.EXILED, source, game);
}
return true;
}
return false;
// cards in Hand
cardsCount = Math.min(targetPlayer.getHand().count(filter, game), maxRemaining);
filter.setMessage(message + " in the hand of " + targetPlayer.getName());
TargetCard target = new TargetCard(0, cardsCount, Zone.HAND, filter);
target.withNotTarget(true);
if (controller.choose(Outcome.Exile, targetPlayer.getHand(), target, source, game)) {
maxRemaining -= target.getTargets().size();
if (drawForEachHandCard) {
handCards = target.getTargets().size();
}
controller.moveCards(new CardsImpl(target.getTargets()), Zone.EXILED, source, game);
}
// cards in Library
Cards cardsInLibrary = new CardsImpl();
cardsInLibrary.addAllCards(targetPlayer.getLibrary().getCards(game));
cardsCount = Math.min(cardsInLibrary.count(filter, game), maxRemaining);
filter.setMessage(message + " in the library of " + targetPlayer.getLogName());
TargetCardInLibrary targetLib = new TargetCardInLibrary(0, cardsCount, filter);
if (controller.choose(Outcome.Exile, cardsInLibrary, targetLib, source, game)) {
controller.moveCards(new CardsImpl(targetLib.getTargets()), Zone.EXILED, source, game);
}
targetPlayer.shuffleLibrary(source, game);
if (handCards > 0) {
targetPlayer.drawCards(handCards, source, game);
}
return true;
}
}