mirror of
https://github.com/correl/mage.git
synced 2024-12-24 11:50:45 +00:00
[SWS] Fixed a bug of the watcher used for the hate ability.
This commit is contained in:
parent
54d5599e06
commit
a47aa158f0
3 changed files with 7 additions and 9 deletions
|
@ -47,13 +47,13 @@ import mage.watchers.common.LifeLossOtherFromCombatWatcher;
|
|||
public class SithMarauder extends CardImpl {
|
||||
|
||||
public SithMarauder(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}");
|
||||
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
|
||||
this.subtype.add("Human");
|
||||
this.subtype.add("Sith");
|
||||
this.power = new MageInt(5);
|
||||
this.toughness = new MageInt(4);
|
||||
|
||||
// <i>Hate</i> — When Sith Marauder enters the battlefield, if opponent lost life from source other than combat damage this turn, Sith Marauder deals 3 damage to target creature or player.
|
||||
// <i>Hate</i> — When Sith Marauder enters the battlefield, if an opponent lost life from a source other than combat damage this turn, Sith Marauder deals 3 damage to target creature or player.
|
||||
Ability ability = new ConditionalTriggeredAbility(
|
||||
new EntersBattlefieldTriggeredAbility(new DamageTargetEffect(3)),
|
||||
HateCondition.getInstance(),
|
||||
|
|
|
@ -25,16 +25,14 @@
|
|||
* authors and should not be interpreted as representing official policies, either expressed
|
||||
* or implied, of BetaSteward_at_googlemail.com.
|
||||
*/
|
||||
|
||||
package mage.cards.v;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import mage.constants.CardType;
|
||||
import mage.abilities.effects.common.LoseLifeTargetControllerEffect;
|
||||
import mage.abilities.effects.common.ReturnToHandTargetEffect;
|
||||
import mage.cards.CardImpl;
|
||||
import mage.cards.CardSetInfo;
|
||||
import mage.constants.CardType;
|
||||
import mage.target.common.TargetCreaturePermanent;
|
||||
|
||||
/**
|
||||
|
@ -43,17 +41,16 @@ import mage.target.common.TargetCreaturePermanent;
|
|||
*/
|
||||
public class VaporSnag extends CardImpl {
|
||||
|
||||
public VaporSnag (UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId,setInfo,new CardType[]{CardType.INSTANT},"{U}");
|
||||
public VaporSnag(UUID ownerId, CardSetInfo setInfo) {
|
||||
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{U}");
|
||||
|
||||
|
||||
// Return target creature to its owner's hand. Its controller loses 1 life.
|
||||
this.getSpellAbility().addEffect(new ReturnToHandTargetEffect());
|
||||
this.getSpellAbility().addEffect(new LoseLifeTargetControllerEffect(1));
|
||||
this.getSpellAbility().addTarget(new TargetCreaturePermanent());
|
||||
}
|
||||
|
||||
public VaporSnag (final VaporSnag card) {
|
||||
public VaporSnag(final VaporSnag card) {
|
||||
super(card);
|
||||
}
|
||||
|
||||
|
|
|
@ -50,6 +50,7 @@ public class LifeLossOtherFromCombatWatcher extends Watcher {
|
|||
|
||||
public LifeLossOtherFromCombatWatcher(final LifeLossOtherFromCombatWatcher watcher) {
|
||||
super(watcher);
|
||||
this.players.addAll(watcher.players);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue