External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix Eye of Ojer Taq target filtering and Apex Observatory card type selection

Browse source 
* prevent selecting cards of different card types when using craft
* fix choosing a shared card type with split cards
This commit is contained in:
jmlundeen 2025-12-07 11:37:12 -06:00
parent 7d2e95cddd
commit b1af2e5fbd
1 changed files with 44 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

66
Mage.Sets/src/mage/cards/e/EyeOfOjerTaq.java
View file

@ -101,6 +101,39 @@ class EyeOfOjerTaqTarget extends TargetCardInGraveyardBattlefieldOrStack {
return new EyeOfOjerTaqTarget(this); return new EyeOfOjerTaqTarget(this);
} }
@Override
public Set<UUID> possibleTargets(UUID sourceControllerId, Ability source, Game game) {
Set<UUID> possibleTargets = super.possibleTargets(sourceControllerId, source, game);
Set<UUID> targetIds = new HashSet<>(this.getTargets());
if (targetIds.isEmpty()) {
return possibleTargets;
}
Set<CardType> unionTypes = new HashSet<>();
for (UUID tId : this.getTargets()) {
Card tCard = game.getCard(tId);
if (tCard != null) {
unionTypes.addAll(tCard.getCardType(game));
}
}
return possibleTargets.stream()
.filter(id -> {
if (targetIds.contains(id)) {
return true;
}
Card card = game.getCard(id);
if (card == null) {
return false;
}
for (CardType type : card.getCardType(game)) {
if (unionTypes.contains(type)) {
return true;
}
}
return false;
})
.collect(Collectors.toSet());
}
@Override @Override
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) { public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
if (!super.canTarget(playerId, id, source, game)) { if (!super.canTarget(playerId, id, source, game)) {
@ -118,9 +151,11 @@ class EyeOfOjerTaqTarget extends TargetCardInGraveyardBattlefieldOrStack {
if (card1.getId().equals(card2.getId())) { if (card1.getId().equals(card2.getId())) {
return false; return false;
} }
// this should be returned true, but the invert works.
// if you note the code logic issue, please speak up.
for (CardType type : card1.getCardType(game)) { for (CardType type : card1.getCardType(game)) {
if (card2.getCardType(game).contains(type)) { if (card2.getCardType(game).contains(type)) {
return false; // see comment in original code return false;
} }
} }
return true; return true;
@ -142,7 +177,7 @@ class ChooseCardTypeEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
MageObject mageObject = game.getPermanentEntering(source.getSourceId()); MageObject mageObject = game.getPermanentEntering(source.getSourceId());
List<CardType> exiledCardsCardType = new ArrayList<>(); Set<CardType> exiledCardsCardType = new HashSet<>();
if (mageObject == null) { if (mageObject == null) {
mageObject = game.getObject(source); mageObject = game.getObject(source);
} }
@ -158,30 +193,17 @@ class ChooseCardTypeEffect extends OneShotEffect {
if (exileZone == null) { if (exileZone == null) {
return false; return false;
} }
List<String> sharedCardTypes = new ArrayList<>();
for (Card card : exileZone.getCards(game)) { for (Card card : exileZone.getCards(game)) {
exiledCardsCardType.addAll(card.getCardType(game)); for (CardType cardType : card.getCardType(game)) {
} if (!exiledCardsCardType.add(cardType)) {
Choice cardTypeChoice = new ChoiceCardType(); sharedCardTypes.add(cardType.toString());
cardTypeChoice.getChoices().clear();
cardTypeChoice.getChoices().addAll(exiledCardsCardType.stream().map(CardType::toString).collect(Collectors.toList()));
Map<String, Integer> cardTypeCounts = new HashMap<>();
for (String cardType : cardTypeChoice.getChoices()) {
cardTypeCounts.put(cardType, 0);
}
for (Card c : exileZone.getCards(game)) {
for (CardType cardType : c.getCardType(game)) {
if (cardTypeCounts.containsKey(cardType.toString())) {
cardTypeCounts.put(cardType.toString(), cardTypeCounts.get(cardType.toString()) + 1);
} }
} }
} }
List<String> sharedCardTypes = new ArrayList<>(); Choice cardTypeChoice = new ChoiceCardType();
int numExiledCards = exileZone.getCards(game).size(); cardTypeChoice.getChoices().clear();
for (Map.Entry<String, Integer> entry : cardTypeCounts.entrySet()) { cardTypeChoice.getChoices().addAll(sharedCardTypes);
if (entry.getValue() == numExiledCards) {
sharedCardTypes.add(entry.getKey());
}
}
if (sharedCardTypes.isEmpty()) { if (sharedCardTypes.isEmpty()) {
game.informPlayers(mageObject.getIdName() + " No exiled cards shared a type in exile, so nothing is done."); game.informPlayers(mageObject.getIdName() + " No exiled cards shared a type in exile, so nothing is done.");
if (mageObject instanceof Permanent) { if (mageObject instanceof Permanent) {