mirror of
https://github.com/magefree/mage.git
synced 2025-12-23 12:02:01 -08:00
* Ground Seal - Fixed a problem, that cards that need to target cards in graveyard caused a game lock, if ground seal was on the battlefield.
This commit is contained in:
parent
bf3e3c0ddb
commit
ba885fef91
6 changed files with 98 additions and 52 deletions
|
|
@ -38,6 +38,7 @@ import mage.players.Player;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
import mage.game.events.GameEvent;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
|
|
@ -87,28 +88,53 @@ public class TargetCard extends TargetObject {
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
|
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
|
||||||
|
int possibleTargets = 0;
|
||||||
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
|
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
|
||||||
Player player = game.getPlayer(playerId);
|
Player player = game.getPlayer(playerId);
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
switch (zone) {
|
switch (zone) {
|
||||||
case HAND:
|
case HAND:
|
||||||
if (player.getHand().count(filter, sourceId, sourceControllerId, game) >= this.minNumberOfTargets) {
|
for (Card card : player.getHand().getCards(filter, game)) {
|
||||||
return true;
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
possibleTargets++;
|
||||||
|
if (possibleTargets >= this.minNumberOfTargets) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case GRAVEYARD:
|
case GRAVEYARD:
|
||||||
if (player.getGraveyard().count(filter, sourceId, sourceControllerId, game) >= this.minNumberOfTargets) {
|
for (Card card : player.getGraveyard().getCards(filter, game)) {
|
||||||
return true;
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
possibleTargets++;
|
||||||
|
if (possibleTargets >= this.minNumberOfTargets) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case LIBRARY:
|
case LIBRARY:
|
||||||
if (player.getLibrary().count(filter, game) >= this.minNumberOfTargets) {
|
for (Card card : player.getLibrary().getUniqueCards(game)) {
|
||||||
return true;
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
if (filter.match(card, game)) {
|
||||||
|
possibleTargets++;
|
||||||
|
if (possibleTargets >= this.minNumberOfTargets) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case EXILED:
|
case EXILED:
|
||||||
if (game.getExile().getPermanentExile().count(filter, sourceId, sourceControllerId, game) >= this.minNumberOfTargets) {
|
for (Card card : game.getExile().getPermanentExile().getCards(game)) {
|
||||||
return true;
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
if (filter.match(card, player.getId(), game)) {
|
||||||
|
possibleTargets++;
|
||||||
|
if (possibleTargets >= this.minNumberOfTargets) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -131,11 +157,51 @@ public class TargetCard extends TargetObject {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
|
||||||
return possibleTargets(sourceControllerId, game);
|
Set<UUID> possibleTargets = new HashSet<>();
|
||||||
|
for (UUID playerId : game.getPlayer(sourceControllerId).getInRange()) {
|
||||||
|
Player player = game.getPlayer(playerId);
|
||||||
|
if (player != null) {
|
||||||
|
switch (zone) {
|
||||||
|
case HAND:
|
||||||
|
for (Card card : player.getHand().getCards(filter, game)) {
|
||||||
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
possibleTargets.add(card.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case GRAVEYARD:
|
||||||
|
for (Card card : player.getGraveyard().getCards(filter, game)) {
|
||||||
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
possibleTargets.add(card.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case LIBRARY:
|
||||||
|
for (Card card : player.getLibrary().getUniqueCards(game)) {
|
||||||
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
if (filter.match(card, game)) {
|
||||||
|
possibleTargets.add(card.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case EXILED:
|
||||||
|
for (Card card : game.getExile().getPermanentExile().getCards(game)) {
|
||||||
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
if (filter.match(card, player.getId(), game)) {
|
||||||
|
possibleTargets.add(card.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return possibleTargets;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Set<UUID> possibleTargets(UUID sourceControllerId, Cards cards, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceControllerId, Cards cards, Game game) {
|
||||||
Set<UUID> possibleTargets = new HashSet<UUID>();
|
Set<UUID> possibleTargets = new HashSet<>();
|
||||||
for (Card card: cards.getCards(filter, game)) {
|
for (Card card: cards.getCards(filter, game)) {
|
||||||
possibleTargets.add(card.getId());
|
possibleTargets.add(card.getId());
|
||||||
}
|
}
|
||||||
|
|
@ -144,39 +210,7 @@ public class TargetCard extends TargetObject {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
||||||
Set<UUID> possibleTargets = new HashSet<UUID>();
|
return possibleTargets(null, sourceControllerId, game);
|
||||||
for (UUID playerId : game.getPlayer(sourceControllerId).getInRange()) {
|
|
||||||
Player player = game.getPlayer(playerId);
|
|
||||||
if (player != null) {
|
|
||||||
switch (zone) {
|
|
||||||
case HAND:
|
|
||||||
for (Card card : player.getHand().getCards(filter, game)) {
|
|
||||||
possibleTargets.add(card.getId());
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case GRAVEYARD:
|
|
||||||
for (Card card : player.getGraveyard().getCards(filter, game)) {
|
|
||||||
possibleTargets.add(card.getId());
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case LIBRARY:
|
|
||||||
for (Card card : player.getLibrary().getUniqueCards(game)) {
|
|
||||||
if (filter.match(card, game)) {
|
|
||||||
possibleTargets.add(card.getId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case EXILED:
|
|
||||||
for (Card card : game.getExile().getPermanentExile().getUniqueCards(game)) {
|
|
||||||
if (filter.match(card, player.getId(), game)) {
|
|
||||||
possibleTargets.add(card.getId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return possibleTargets;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean canTarget(UUID id, Cards cards, Game game) {
|
public boolean canTarget(UUID id, Cards cards, Game game) {
|
||||||
|
|
|
||||||
|
|
@ -220,12 +220,12 @@ public abstract class TargetImpl implements Target {
|
||||||
if (maxNumberOfTargets == 0 || targets.size() < maxNumberOfTargets) {
|
if (maxNumberOfTargets == 0 || targets.size() < maxNumberOfTargets) {
|
||||||
if (!targets.containsKey(id)) {
|
if (!targets.containsKey(id)) {
|
||||||
if (source != null) {
|
if (source != null) {
|
||||||
if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getId(), source.getControllerId()))) {
|
if (!game.replaceEvent(GameEvent.getEvent(EventType.TARGET, id, source.getSourceId(), source.getControllerId()))) {
|
||||||
targets.put(id, 0);
|
targets.put(id, 0);
|
||||||
rememberZoneChangeCounter(id, game);
|
rememberZoneChangeCounter(id, game);
|
||||||
chosen = targets.size() >= minNumberOfTargets;
|
chosen = targets.size() >= minNumberOfTargets;
|
||||||
if (!skipEvent) {
|
if (!skipEvent) {
|
||||||
game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getId(), source.getControllerId()));
|
game.fireEvent(GameEvent.getEvent(EventType.TARGETED, id, source.getSourceId(), source.getControllerId()));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,9 @@ public class TargetStackObject extends TargetObject {
|
||||||
for (StackObject stackObject: game.getStack()) {
|
for (StackObject stackObject: game.getStack()) {
|
||||||
if (game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getControllerId()) && filter.match(stackObject, game)) {
|
if (game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getControllerId()) && filter.match(stackObject, game)) {
|
||||||
count++;
|
count++;
|
||||||
if (count >= this.minNumberOfTargets)
|
if (count >= this.minNumberOfTargets) {
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
|
@ -110,7 +111,7 @@ public class TargetStackObject extends TargetObject {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
||||||
Set<UUID> possibleTargets = new HashSet<UUID>();
|
Set<UUID> possibleTargets = new HashSet<>();
|
||||||
for (StackObject stackObject: game.getStack()) {
|
for (StackObject stackObject: game.getStack()) {
|
||||||
if (game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getControllerId()) && filter.match(stackObject, game)) {
|
if (game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getControllerId()) && filter.match(stackObject, game)) {
|
||||||
possibleTargets.add(stackObject.getId());
|
possibleTargets.add(stackObject.getId());
|
||||||
|
|
|
||||||
|
|
@ -96,7 +96,7 @@ public class TargetActivatedOrTriggeredAbility extends TargetObject {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
||||||
Set<UUID> possibleTargets = new HashSet<UUID>();
|
Set<UUID> possibleTargets = new HashSet<>();
|
||||||
for (StackObject stackObject : game.getStack()) {
|
for (StackObject stackObject : game.getStack()) {
|
||||||
if (stackObject.getStackAbility() != null && (stackObject.getStackAbility() instanceof ActivatedAbility || stackObject.getStackAbility() instanceof TriggeredAbility) && game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getStackAbility().getControllerId())) {
|
if (stackObject.getStackAbility() != null && (stackObject.getStackAbility() instanceof ActivatedAbility || stackObject.getStackAbility() instanceof TriggeredAbility) && game.getPlayer(sourceControllerId).getInRange().contains(stackObject.getStackAbility().getControllerId())) {
|
||||||
possibleTargets.add(stackObject.getStackAbility().getId());
|
possibleTargets.add(stackObject.getStackAbility().getId());
|
||||||
|
|
|
||||||
|
|
@ -34,6 +34,8 @@ import mage.abilities.Ability;
|
||||||
import mage.cards.Card;
|
import mage.cards.Card;
|
||||||
import mage.filter.FilterCard;
|
import mage.filter.FilterCard;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
|
import mage.game.events.GameEvent;
|
||||||
|
import mage.players.Player;
|
||||||
import mage.target.TargetCard;
|
import mage.target.TargetCard;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -101,8 +103,17 @@ public class TargetCardInYourGraveyard extends TargetCard {
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
|
public boolean canChoose(UUID sourceId, UUID sourceControllerId, Game game) {
|
||||||
if (game.getPlayer(sourceControllerId).getGraveyard().count(filter, sourceId, sourceControllerId, game) >= this.minNumberOfTargets) {
|
Player player = game.getPlayer(sourceControllerId);
|
||||||
return true;
|
if (player != null) {
|
||||||
|
int possibleTargets = 0;
|
||||||
|
for (Card card : player.getGraveyard().getCards(filter, game)) {
|
||||||
|
if (sourceId == null || isNotTarget() || !game.replaceEvent(GameEvent.getEvent(GameEvent.EventType.TARGET, card.getId(), sourceId, sourceControllerId))) {
|
||||||
|
possibleTargets++;
|
||||||
|
if (possibleTargets >= this.minNumberOfTargets) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@ public class TargetCreatureOrPlayer extends TargetImpl {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) {
|
||||||
Set<UUID> possibleTargets = new HashSet<UUID>();
|
Set<UUID> possibleTargets = new HashSet<>();
|
||||||
MageObject targetSource = game.getObject(sourceId);
|
MageObject targetSource = game.getObject(sourceId);
|
||||||
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
|
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
|
||||||
Player player = game.getPlayer(playerId);
|
Player player = game.getPlayer(playerId);
|
||||||
|
|
@ -203,7 +203,7 @@ public class TargetCreatureOrPlayer extends TargetImpl {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
public Set<UUID> possibleTargets(UUID sourceControllerId, Game game) {
|
||||||
Set<UUID> possibleTargets = new HashSet<UUID>();
|
Set<UUID> possibleTargets = new HashSet<>();
|
||||||
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
|
for (UUID playerId: game.getPlayer(sourceControllerId).getInRange()) {
|
||||||
Player player = game.getPlayer(playerId);
|
Player player = game.getPlayer(playerId);
|
||||||
if (player != null && filter.match(player, game)) {
|
if (player != null && filter.match(player, game)) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue