Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

[MKC] Implement Trouble in Pairs (#11807)

Browse source 
* [MKC] Implement Trouble in Pairs

* Delete DrawCardWatcher, use preexisting common watcher

* Fix some unrelated cards' rarities to fix verify

* Implement common turn skipping ability
This commit is contained in:
PurpleCrowbar 2024-02-17 18:30:19 +00:00 • committed by GitHub
parent 4e648a29a9
commit 167a796c72
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 205 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

41
Mage/src/main/java/mage/abilities/common/DrawNthCardTriggeredAbility.java
View file

@ -6,15 +6,12 @@ import mage.abilities.effects.Effect;
import mage.abilities.hint.Hint;
import mage.abilities.hint.ValueHint;
import mage.constants.TargetController;
import mage.constants.WatcherScope;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.events.GameEvent;
import mage.players.Player;
import mage.util.CardUtil;
import mage.watchers.Watcher;
import java.util.*;
import mage.watchers.common.CardsDrawnThisTurnWatcher;
/**
* @author TheElk801
@ -37,7 +34,6 @@ public class DrawNthCardTriggeredAbility extends TriggeredAbilityImpl {
public DrawNthCardTriggeredAbility(Zone zone, Effect effect, boolean optional, TargetController targetController, int cardNumber) {
super(zone, effect, optional);
this.addWatcher(new DrawCardWatcher());
this.targetController = targetController;
this.cardNumber = cardNumber;
this.addHint(hint);
@ -77,7 +73,8 @@ public class DrawNthCardTriggeredAbility extends TriggeredAbilityImpl {
default:
throw new IllegalArgumentException("TargetController " + targetController + " not supported");
}
return DrawCardWatcher.checkEvent(event.getPlayerId(), event, game, cardNumber);
CardsDrawnThisTurnWatcher watcher = game.getState().getWatcher(CardsDrawnThisTurnWatcher.class);
return watcher != null && watcher.getCardsDrawnThisTurn(event.getPlayerId()) == cardNumber;
}
public String generateTriggerPhrase() {
@ -98,35 +95,3 @@ public class DrawNthCardTriggeredAbility extends TriggeredAbilityImpl {
return new DrawNthCardTriggeredAbility(this);
}
}
class DrawCardWatcher extends Watcher {
private final Map<UUID, List<UUID>> drawMap = new HashMap<>();
DrawCardWatcher() {
super(WatcherScope.GAME);
}
@Override
public void watch(GameEvent event, Game game) {
if (event.getType() != GameEvent.EventType.DREW_CARD) {
return;
}
if (!drawMap.containsKey(event.getPlayerId())) {
drawMap.putIfAbsent(event.getPlayerId(), new ArrayList<>());
}
drawMap.get(event.getPlayerId()).add(event.getId());
}
@Override
public void reset() {
super.reset();
drawMap.clear();
}
static boolean checkEvent(UUID playerId, GameEvent event, Game game, int cardNumber) {
Map<UUID, List<UUID>> drawMap = game.getState().getWatcher(DrawCardWatcher.class).drawMap;
return drawMap.containsKey(playerId) && Objects.equals(drawMap.get(playerId).size(), cardNumber) && event.getId().equals(drawMap.get(playerId).get(cardNumber - 1));
}
}