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

updated Fell Shepherd to not use player-scope watcher

Browse source
This commit is contained in:
Evan Kranzler 2019-01-21 11:26:01 -05:00
parent f6f517b746
commit dad4a3e9ff
1 changed files with 39 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Mage.Sets/src/mage/cards/f/FellShepherd.java
View file

@ -1,11 +1,8 @@
package mage.cards.f; package mage.cards.f;
import java.util.HashSet;
import java.util.Set;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.MageObject; import mage.MageObjectReference;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.common.SimpleActivatedAbility;
@ -13,21 +10,21 @@ import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect; import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.cards.Card; import mage.cards.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*; import mage.constants.*;
import mage.filter.StaticFilters; import mage.filter.StaticFilters;
import mage.game.Game; import mage.game.Game;
import mage.game.events.GameEvent; import mage.game.events.GameEvent;
import mage.game.events.GameEvent.EventType; import mage.game.events.GameEvent.EventType;
import mage.game.events.ZoneChangeEvent; import mage.game.events.ZoneChangeEvent;
import mage.players.Player;
import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent; import mage.target.common.TargetCreaturePermanent;
import mage.watchers.Watcher; import mage.watchers.Watcher;
import java.util.*;
/** /**
*
* @author LevelX2 * @author LevelX2
*/ */
public final class FellShepherd extends CardImpl { public final class FellShepherd extends CardImpl {
@ -43,14 +40,18 @@ public final class FellShepherd extends CardImpl {
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new FellShepherdEffect(), true), new FellShepherdWatcher()); this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new FellShepherdEffect(), true), new FellShepherdWatcher());
// {B}, Sacrifice another creature: Target creature gets -2/-2 until end of turn. // {B}, Sacrifice another creature: Target creature gets -2/-2 until end of turn.
SimpleActivatedAbility ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{B}")); SimpleActivatedAbility ability = new SimpleActivatedAbility(
ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE, false))); new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{B}")
);
ability.addCost(new SacrificeTargetCost(
new TargetControlledCreaturePermanent(StaticFilters.FILTER_CONTROLLED_ANOTHER_CREATURE)
));
ability.addTarget(new TargetCreaturePermanent()); ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability); this.addAbility(ability);
} }
public FellShepherd(final FellShepherd card) { private FellShepherd(final FellShepherd card) {
super(card); super(card);
} }
@ -62,16 +63,15 @@ public final class FellShepherd extends CardImpl {
class FellShepherdWatcher extends Watcher { class FellShepherdWatcher extends Watcher {
private Set<UUID> creatureIds = new HashSet<>(); private final Map<UUID, Set<MageObjectReference>> playerMap = new HashMap();
public FellShepherdWatcher() { FellShepherdWatcher() {
super(FellShepherdWatcher.class, WatcherScope.PLAYER); super(FellShepherdWatcher.class, WatcherScope.GAME);
condition = true;
} }
public FellShepherdWatcher(final FellShepherdWatcher watcher) { private FellShepherdWatcher(final FellShepherdWatcher watcher) {
super(watcher); super(watcher);
this.creatureIds.addAll(watcher.creatureIds); this.playerMap.putAll(watcher.playerMap);
} }
@Override @Override
@ -79,16 +79,17 @@ class FellShepherdWatcher extends Watcher {
return new FellShepherdWatcher(this); return new FellShepherdWatcher(this);
} }
public Set<UUID> getCreaturesIds() { Set<MageObjectReference> getRefSet(UUID playerId) {
return creatureIds; return playerMap.get(playerId);
} }
@Override @Override
public void watch(GameEvent event, Game game) { public void watch(GameEvent event, Game game) {
if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) { if (event.getType() == EventType.ZONE_CHANGE && ((ZoneChangeEvent) event).isDiesEvent()) {
MageObject card = game.getLastKnownInformation(event.getTargetId(), Zone.BATTLEFIELD); Card card = game.getCard(event.getTargetId());
if (card != null && ((Card) card).isOwnedBy(this.controllerId) && card.isCreature()) { if (card != null && card.isCreature()) {
creatureIds.add(card.getId()); playerMap.putIfAbsent(card.getOwnerId(), new HashSet());
playerMap.get(card.getOwnerId()).add(new MageObjectReference(card, game));
} }
} }
} }
@ -96,18 +97,18 @@ class FellShepherdWatcher extends Watcher {
@Override @Override
public void reset() { public void reset() {
super.reset(); super.reset();
creatureIds.clear(); playerMap.clear();
} }
} }
class FellShepherdEffect extends OneShotEffect { class FellShepherdEffect extends OneShotEffect {
public FellShepherdEffect() { FellShepherdEffect() {
super(Outcome.ReturnToHand); super(Outcome.ReturnToHand);
this.staticText = "return to your hand all creature cards that were put into your graveyard from the battlefield this turn"; this.staticText = "return to your hand all creature cards that were put into your graveyard from the battlefield this turn";
} }
public FellShepherdEffect(final FellShepherdEffect effect) { private FellShepherdEffect(final FellShepherdEffect effect) {
super(effect); super(effect);
} }
@ -118,24 +119,19 @@ class FellShepherdEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
FellShepherdWatcher watcher = game.getState().getWatcher(FellShepherdWatcher.class, source.getControllerId()); FellShepherdWatcher watcher = game.getState().getWatcher(FellShepherdWatcher.class);
if (watcher != null) { Player player = game.getPlayer(source.getControllerId());
StringBuilder sb = new StringBuilder(); if (watcher == null || player == null) {
for (UUID creatureId : watcher.getCreaturesIds()) {
if (game.getState().getZone(creatureId) == Zone.GRAVEYARD) {
Card card = game.getCard(creatureId);
if (card != null) {
card.moveToZone(Zone.HAND, source.getSourceId(), game, false);
sb.append(' ').append(card.getName());
}
}
}
if (sb.length() > 0) {
sb.insert(0, "Fell Shepherd - returning to hand:");
game.informPlayers(sb.toString());
}
return true;
}
return false; return false;
} }
Cards cards = new CardsImpl();
for (MageObjectReference mor : watcher.getRefSet(source.getControllerId())) {
Card card = mor.getCard(game);
if (card != null) {
cards.add(card);
}
}
player.moveCards(cards, Zone.HAND, source, game);
return true;
}
} }