External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
DrawSecondCardTriggeredAbility refactored into DrawCardTriggeredAbility
DynamicValue support for DrawCardTriggeredAbility
DynamicValue support for BoostAllOfChosenSubtypeEffect

Co-authored-by: drago <drago@192.168.1.72>
This commit is contained in:
amoscatelli 2023-04-01 21:45:18 +02:00 • committed by GitHub
parent e1c7139425
commit 0ebaeb20c7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 172 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

@ -1,6 +1,7 @@
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;
@ -23,6 +24,10 @@ 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;