github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

3 new cards

Browse source 
[CHK] Marrow-Gnawer / Orochi Eggwatcher / Kiku, Night's Flower

Fix
ShisatoWhisperingHunter - using now sacrificeControllerEffect instead of sacrificeEffect

Framework
BeginningOfUpkeepTriggeredAbility - reverted change to set targetPointer if targetController == YOU (this caused unwanted side effects)
SacrificeControllerEffect - new effect that the controller of an ability has to sacrifice something
GainAbilityAllEffect - improved text generation
some minor comment and include fixes
This commit is contained in:
LevelX 2012-01-24 23:33:27 +01:00
parent 9ce828f491
commit 6a282d1e51
12 changed files with 426 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
Mage.Client/release/sample-decks/Ala-M10-Zen/Tobias Gr�fensteiner's Pyromancer Ascension.dck → Mage.Client/release/sample-decks/Ala-M10-Zen/Tobias Gräfensteiner's Pyromancer Ascension.dck
View file

2
Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfCleansingFire.java
View file

@ -58,6 +58,8 @@ public class HondenOfCleansingFire extends CardImpl<HondenOfCleansingFire> {
this.supertype.add("Legendary");
this.subtype.add("Shrine");
this.color.setWhite(true);
// At the beginning of your upkeep, you gain 2 life for each Shrine you control.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new GainLifeEffect(new PermanentsOnBattlefieldCount(filter, 2)), Constants.TargetController.YOU, false));
}

5
Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfInfiniteRage.java
View file

@ -29,7 +29,6 @@
package mage.sets.championsofkamigawa;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
@ -60,7 +59,9 @@ public class HondenOfInfiniteRage extends CardImpl<HondenOfInfiniteRage> {
this.expansionSetCode = "CHK";
this.supertype.add("Legendary");
this.subtype.add("Shrine");
this.color.setRed(true);
this.color.setRed(true);
// At the beginning of your upkeep, Honden of Infinite Rage deals damage to target creature or player equal to the number of Shrines you control.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new DamageTargetEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false);
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability);

5
Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfNightsReach.java
View file

@ -29,7 +29,6 @@
package mage.sets.championsofkamigawa;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
@ -47,7 +46,7 @@ import mage.target.common.TargetOpponent;
*/
public class HondenOfNightsReach extends CardImpl<HondenOfNightsReach> {
final static FilterControlledPermanent filter = new FilterControlledPermanent("shrine");
final static FilterControlledPermanent filter = new FilterControlledPermanent("Shrine");
static {
filter.getSubtype().add("Shrine");
@ -60,6 +59,8 @@ public class HondenOfNightsReach extends CardImpl<HondenOfNightsReach> {
this.supertype.add("Legendary");
this.subtype.add("Shrine");
this.color.setBlack(true);
// At the beginning of your upkeep, target opponent discards a card for each Shrine you control.
Ability ability = new BeginningOfUpkeepTriggeredAbility(new DiscardTargetEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false);
ability.addTarget(new TargetOpponent());
this.addAbility(ability);

2
Mage.Sets/src/mage/sets/championsofkamigawa/HondenOfSeeingWinds.java
View file

@ -58,6 +58,8 @@ public class HondenOfSeeingWinds extends CardImpl<HondenOfSeeingWinds> {
this.supertype.add("Legendary");
this.subtype.add("Shrine");
this.color.setBlue(true);
// At the beginning of your upkeep, draw a card for each Shrine you control.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new DrawCardControllerEffect(new PermanentsOnBattlefieldCount(filter)), Constants.TargetController.YOU, false));
}

111
Mage.Sets/src/mage/sets/championsofkamigawa/KikuNightsFlower.java Normal file
View file

@ -0,0 +1,111 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.championsofkamigawa;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.effects.OneShotEffect;
import mage.cards.CardImpl;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.target.common.TargetCreaturePermanent;
/**
*
* @author LevelX
*/
public class KikuNightsFlower extends CardImpl<KikuNightsFlower> {
public KikuNightsFlower (UUID ownerId) {
super(ownerId, 121, "Kiku, Night's Flower", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{B}{B}");
this.expansionSetCode = "CHK";
this.supertype.add("Legendary");
this.subtype.add("Human");
this.subtype.add("Assassin");
this.color.setBlack(true);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// {2}{B}{B}, {T}: Target creature deals damage to itself equal to its power.
Ability ability;
ability = new SimpleActivatedAbility(
Zone.BATTLEFIELD,
new KikuNightsFlowerEffect(),
new ManaCostsImpl("{2}{B}{B}")
);
ability.addTarget(new TargetCreaturePermanent());
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}
public KikuNightsFlower (final KikuNightsFlower card) {
super(card);
}
@Override
public KikuNightsFlower copy() {
return new KikuNightsFlower(this);
}
}
class KikuNightsFlowerEffect extends OneShotEffect<KikuNightsFlowerEffect> {
public KikuNightsFlowerEffect() {
super(Constants.Outcome.Damage);
this.staticText = "Target creature deals damage to itself equal to its power";
}
public KikuNightsFlowerEffect(final KikuNightsFlowerEffect effect) {
super(effect);
}
@Override
public KikuNightsFlowerEffect copy() {
return new KikuNightsFlowerEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(targetPointer.getFirst(source));
if (permanent != null) {
permanent.damage(permanent.getPower().getValue(), permanent.getId(), game, true, false);
return true;
}
return false;
}
}

110
Mage.Sets/src/mage/sets/championsofkamigawa/MarrowGnawer.java Normal file
View file

@ -0,0 +1,110 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.championsofkamigawa;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.ObjectColor;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.dynamicvalue.common.PermanentsOnBattlefieldCount;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.continious.GainAbilityAllEffect;
import mage.abilities.keyword.FearAbility;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.permanent.token.Token;
import mage.target.common.TargetControlledPermanent;
/**
*
* @author LevelX
*/
public class MarrowGnawer extends CardImpl<MarrowGnawer> {
private static final FilterCreaturePermanent filterFear = new FilterCreaturePermanent("Rat creatures");
private static final FilterControlledCreaturePermanent filterSacrifice = new FilterControlledCreaturePermanent("a Rat");
private static final FilterControlledCreaturePermanent filter3 = new FilterControlledCreaturePermanent("Rats you control");
static {
filterFear.getSubtype().add("Rat");
filterSacrifice.getSubtype().add("Rat");
filter3.getSubtype().add("Rat");
}
public MarrowGnawer (UUID ownerId) {
super(ownerId, 124, "Marrow-Gnawer", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
this.expansionSetCode = "CHK";
this.subtype.add("Rat");
this.subtype.add("Rogue");
this.color.setBlack(true);
this.power = new MageInt(2);
this.toughness = new MageInt(3);
// Rat creatures have fear. (They can't be blocked except by artifact creatures and/or black creatures.)
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(FearAbility.getInstance(), Constants.Duration.WhileOnBattlefield, filterFear)));
// {T}, Sacrifice a Rat: Put X 1/1 black Rat creature tokens onto the battlefield, where X is the number of Rats you control.
Ability ability;
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new RatToken(),new PermanentsOnBattlefieldCount(filter3)), new SacrificeTargetCost(new TargetControlledPermanent(filterSacrifice)));
ability.addCost(new TapSourceCost());
this.addAbility(ability);
}
public MarrowGnawer (final MarrowGnawer card) {
super(card);
}
@Override
public MarrowGnawer copy() {
return new MarrowGnawer(this);
}
}
class RatToken extends Token {
public RatToken() {
super("Rat", "1/1 black Rat creature token");
cardType.add(CardType.CREATURE);
color = ObjectColor.BLACK;
subtype.add("Rat");
power = new MageInt(1);
toughness = new MageInt(1);
}
}

117
Mage.Sets/src/mage/sets/championsofkamigawa/OrochiEggwatcher.java Normal file
View file

@ -0,0 +1,117 @@
/*
*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*
*/
package mage.sets.championsofkamigawa;
import java.util.UUID;
import mage.Constants;
import mage.Constants.CardType;
import mage.Constants.Duration;
import mage.Constants.Rarity;
import mage.Constants.Zone;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.condition.common.ControlsPermanentCondition;
import mage.abilities.condition.common.FlippedCondition;
import mage.abilities.costs.common.SacrificeTargetCost;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.costs.mana.ManaCostsImpl;
import mage.abilities.decorator.ConditionalContinousEffect;
import mage.abilities.decorator.ConditionalOneShotEffect;
import mage.abilities.effects.common.CopyTokenEffect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.FlipSourceEffect;
import mage.abilities.effects.common.continious.BoostTargetEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.game.permanent.token.SnakeToken;
import mage.game.permanent.token.Token;
import mage.target.common.TargetControlledCreaturePermanent;
import mage.target.common.TargetCreaturePermanent;
/**
* @author LevelX
*/
public class OrochiEggwatcher extends CardImpl<OrochiEggwatcher> {
public OrochiEggwatcher(UUID ownerId) {
super(ownerId, 233, "Orochi Eggwatcher", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{G}");
this.expansionSetCode = "CHK";
this.subtype.add("Snake");
this.subtype.add("Shaman");
this.color.setGreen(true);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
// {2}{G}, {T}: Put a 1/1 green Snake creature token onto the battlefield. If you control ten or more creatures, flip Orochi Eggwatcher.
Ability ability;
ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken()),new ManaCostsImpl("{2}{G}"));
ability.addCost(new TapSourceCost());
ability.addEffect(new ConditionalOneShotEffect(new FlipSourceEffect(),
new ControlsPermanentCondition(new FilterControlledCreaturePermanent(),ControlsPermanentCondition.CountType.MORE_THAN, 9),"If you control ten or more creatures, flip {this}"));
this.addAbility(ability);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(new CopyTokenEffect(new ShidakoBroodmistress()), FlippedCondition.getInstance(), "")));
}
public OrochiEggwatcher(final OrochiEggwatcher card) {
super(card);
}
@Override
public OrochiEggwatcher copy() {
return new OrochiEggwatcher(this);
}
}
class ShidakoBroodmistress extends Token {
ShidakoBroodmistress() {
super("Shidako, Broodmistress", "");
supertype.add("Legendary");
cardType.add(Constants.CardType.CREATURE);
color.setGreen(true);
subtype.add("Snake");
subtype.add("Shaman");
power = new MageInt(3);
toughness = new MageInt(3);
// {G}, Sacrifice a creature: Target creature gets +3/+3 until end of turn.
Ability ability;
ability = new SimpleActivatedAbility(
Zone.BATTLEFIELD,
new BoostTargetEffect(3,3, Duration.EndOfTurn),
new ManaCostsImpl("{G}"));
ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent()));
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability);
}
}

10
Mage.Sets/src/mage/sets/championsofkamigawa/ShisatoWhisperingHunter.java
View file

@ -35,7 +35,7 @@ import mage.Constants.TargetController;
import mage.MageInt;
import mage.abilities.common.BeginningOfUpkeepTriggeredAbility;
import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility;
import mage.abilities.effects.common.SacrificeEffect;
import mage.abilities.effects.common.SacrificeControllerEffect;
import mage.abilities.effects.common.SkipNextPlayerUntapStepEffect;
import mage.cards.CardImpl;
import mage.filter.common.FilterControlledCreaturePermanent;
@ -47,7 +47,7 @@ import mage.filter.common.FilterControlledCreaturePermanent;
public class ShisatoWhisperingHunter extends CardImpl<ShisatoWhisperingHunter> {
private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("a Snake");
private final static FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("Snake");
static {
filter.getSubtype().add("Snake");
@ -66,11 +66,9 @@ public class ShisatoWhisperingHunter extends CardImpl<ShisatoWhisperingHunter> {
this.toughness = new MageInt(2);
// At the beginning of your upkeep, sacrifice a Snake.
// this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ShisatoWhisperinSacrificeEffect(filter, 1,""), Constants.TargetController.YOU, false));
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeEffect(filter, 1,""), Constants.TargetController.YOU, false));
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new SacrificeControllerEffect(filter, 1,""), Constants.TargetController.YOU, false));
// Whenever Shisato, Whispering Hunter deals combat damage to a player, that player skips his or her next untap step.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SkipNextPlayerUntapStepEffect("that"),false, true));
// this.addAbility(new ShisatoWhisperingHunterAbility());
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new SkipNextPlayerUntapStepEffect("that "),false, true));
}
public ShisatoWhisperingHunter(final ShisatoWhisperingHunter card) {

8
Mage/src/mage/abilities/common/BeginningOfUpkeepTriggeredAbility.java
View file

@ -34,13 +34,7 @@ public class BeginningOfUpkeepTriggeredAbility extends TriggeredAbilityImpl<Begi
if (event.getType() == GameEvent.EventType.UPKEEP_STEP_PRE) {
switch (targetController) {
case YOU:
if (event.getPlayerId().equals(this.controllerId)) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(event.getPlayerId()));
}
return true;
}
return false;
return event.getPlayerId().equals(this.controllerId);
case OPPONENT:
if (game.getOpponents(this.controllerId).contains(event.getPlayerId())) {
for (Effect effect : this.getEffects()) {

67
Mage/src/mage/abilities/effects/common/SacrificeControllerEffect.java Normal file
View file

@ -0,0 +1,67 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.abilities.effects.common;
import mage.abilities.Ability;
import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.target.targetpointer.FixedTarget;
/**
*
* @author LevelX
*/
public class SacrificeControllerEffect extends SacrificeEffect {
public SacrificeControllerEffect ( FilterPermanent filter, DynamicValue count, String preText ) {
super(filter, count, preText);
}
public SacrificeControllerEffect ( FilterPermanent filter, int count, String preText ) {
this(filter, new StaticValue(count), preText);
}
public SacrificeControllerEffect (final SacrificeControllerEffect effect ) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
this.targetPointer = new FixedTarget(source.getControllerId());
return super.apply(game, source);
}
@Override
public SacrificeControllerEffect copy() {
return new SacrificeControllerEffect(this);
}
}

8
Mage/src/mage/abilities/effects/common/continious/GainAbilityAllEffect.java
View file

@ -37,7 +37,6 @@ import mage.abilities.effects.ContinuousEffectImpl;
import mage.filter.FilterPermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.game.permanent.PermanentToken;
/**
*
@ -105,7 +104,12 @@ public class GainAbilityAllEffect extends ContinuousEffectImpl<GainAbilityAllEff
StringBuilder sb = new StringBuilder();
if (excludeSource)
sb.append("Other ");
sb.append(filter.getMessage()).append(" gain ").append(ability.getRule());
sb.append(filter.getMessage());
if (duration.equals(Duration.WhileOnBattlefield))
sb.append(" have ");
else
sb.append(" gain ");
sb.append(ability.getRule());
sb.append(" ").append(duration.toString());
staticText = sb.toString();
}