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

Revert "[J22] Implement Alandra, Sky Dreamer and refactor of DrawSecondCardTriggeredAbility (#10092)" (#10193)

Browse source 
This reverts commit 0ebaeb20c7.
This commit is contained in:
Evan Kranzler 2023-04-08 21:42:50 -04:00 • committed by GitHub
parent f18341b9b9
commit b3245e0238
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 73 additions and 172 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Mage/src/main/java/mage/abilities/common/DrawCardTriggeredAbility.java → Mage/src/main/java/mage/abilities/common/DrawSecondCardTriggeredAbility.java
View file

@ -18,36 +18,32 @@ import java.util.*;
/**
* @author TheElk801
*/
public class DrawCardTriggeredAbility extends TriggeredAbilityImpl {
public class DrawSecondCardTriggeredAbility extends TriggeredAbilityImpl {
private static final Hint hint = new ValueHint(
"Cards drawn this turn", CardsDrawnThisTurnDynamicValue.instance
);
private final TargetController targetController;
private final DrawCardWatcher drawCardWatcher = new DrawCardWatcher();
private final Integer cardNumber;
public DrawCardTriggeredAbility(Effect effect, boolean optional, Integer cardNumber) {
this(effect, optional, TargetController.YOU, cardNumber);
public DrawSecondCardTriggeredAbility(Effect effect, boolean optional) {
this(effect, optional, TargetController.YOU);
}
public DrawCardTriggeredAbility(Effect effect, boolean optional, TargetController targetController, Integer cardNumber) {
this(Zone.BATTLEFIELD, effect, optional, targetController, cardNumber);
public DrawSecondCardTriggeredAbility(Effect effect, boolean optional, TargetController targetController) {
this(Zone.BATTLEFIELD, effect, optional, targetController);
}
public DrawCardTriggeredAbility(Zone zone, Effect effect, boolean optional, TargetController targetController, Integer cardNumber) {
public DrawSecondCardTriggeredAbility(Zone zone, Effect effect, boolean optional, TargetController targetController) {
super(zone, effect, optional);
this.addWatcher(this.drawCardWatcher);
this.addWatcher(new DrawSecondCardWatcher());
this.targetController = targetController;
this.cardNumber = cardNumber;
this.addHint(hint);
setTriggerPhrase(generateTriggerPhrase());
}
private DrawCardTriggeredAbility(final DrawCardTriggeredAbility ability) {
private DrawSecondCardTriggeredAbility(final DrawSecondCardTriggeredAbility ability) {
super(ability);
this.targetController = ability.targetController;
this.cardNumber = ability.cardNumber;
}
@Override
@ -77,7 +73,7 @@ public class DrawCardTriggeredAbility extends TriggeredAbilityImpl {
default:
throw new IllegalArgumentException("TargetController " + targetController + " not supported");
}
return drawCardWatcher.checkEvent(event.getPlayerId(), event, cardNumber);
return DrawSecondCardWatcher.checkEvent(event.getPlayerId(), event, game);
}
public String generateTriggerPhrase() {
@ -94,16 +90,17 @@ public class DrawCardTriggeredAbility extends TriggeredAbilityImpl {
}
@Override
public DrawCardTriggeredAbility copy() {
return new DrawCardTriggeredAbility(this);
public DrawSecondCardTriggeredAbility copy() {
return new DrawSecondCardTriggeredAbility(this);
}
}
class DrawCardWatcher extends Watcher {
class DrawSecondCardWatcher extends Watcher {
private final Map<UUID, SortedSet<UUID>> drawMap = new HashMap<>();
private final Set<UUID> drewOnce = new HashSet<>();
private final Map<UUID, UUID> secondDrawMap = new HashMap<>();
DrawCardWatcher() {
DrawSecondCardWatcher() {
super(WatcherScope.GAME);
}
@ -112,20 +109,21 @@ class DrawCardWatcher extends Watcher {
if (event.getType() != GameEvent.EventType.DREW_CARD) {
return;
}
if (!drawMap.containsKey(event.getPlayerId())) {
drawMap.putIfAbsent(event.getPlayerId(), new TreeSet<>());
if (drewOnce.contains(event.getPlayerId())) {
secondDrawMap.putIfAbsent(event.getPlayerId(), event.getId());
} else {
drewOnce.add(event.getPlayerId());
}
drawMap.get(event.getPlayerId()).add(event.getId());
}
@Override
public void reset() {
super.reset();
drawMap.clear();
drewOnce.clear();
secondDrawMap.clear();
}
public boolean checkEvent(UUID playerId, GameEvent event, Integer cardNumber) {
return this.drawMap.containsKey(playerId) && Objects.equals(this.drawMap.get(playerId).size(), cardNumber) && event.getId().equals(this.drawMap.get(playerId).last());
static boolean checkEvent(UUID playerId, GameEvent event, Game game) {
return event.getId().equals(game.getState().getWatcher(DrawSecondCardWatcher.class).secondDrawMap.getOrDefault(playerId, null));
}
}

5
Mage/src/main/java/mage/abilities/effects/common/continuous/BoostAllOfChosenSubtypeEffect.java
View file

@ -1,7 +1,6 @@
package mage.abilities.effects.common.continuous;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.effects.common.ChooseCreatureTypeEffect;
import mage.constants.Duration;
import mage.constants.SubType;
@ -24,10 +23,6 @@ public class BoostAllOfChosenSubtypeEffect extends BoostAllEffect {
super(power, toughness, duration, filter, excludeSource);
}
public BoostAllOfChosenSubtypeEffect(DynamicValue power, DynamicValue toughness, Duration duration, FilterCreaturePermanent filter, boolean excludeSource) {
super(power, toughness, duration, filter, excludeSource);
}
public BoostAllOfChosenSubtypeEffect(final BoostAllOfChosenSubtypeEffect effect) {
super(effect);
this.subtype = effect.subtype;