mirror of
https://github.com/correl/mage.git
synced 2024-12-25 03:00:15 +00:00
Apocalypse set and 3 cards
This commit is contained in:
parent
480e648c74
commit
db5868649a
10 changed files with 326 additions and 14 deletions
|
@ -25,7 +25,7 @@ public class ManaSymbols {
|
||||||
|
|
||||||
private static final String[] sets = {"DIS", "GPT", "RAV", "MRD",
|
private static final String[] sets = {"DIS", "GPT", "RAV", "MRD",
|
||||||
"10E", "HOP", "ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "M10", "M11",
|
"10E", "HOP", "ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "M10", "M11",
|
||||||
"MBS", "DDF", "DST", "EVE"};
|
"MBS", "DDF", "DST", "EVE", "APC"};
|
||||||
|
|
||||||
|
|
||||||
static public void loadImages() {
|
static public void loadImages() {
|
||||||
|
|
|
@ -5,6 +5,7 @@ import org.mage.plugins.card.dl.DownloadJob;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
|
||||||
import static org.mage.plugins.card.dl.DownloadJob.fromURL;
|
import static org.mage.plugins.card.dl.DownloadJob.fromURL;
|
||||||
|
@ -12,8 +13,14 @@ import static org.mage.plugins.card.dl.DownloadJob.toFile;
|
||||||
|
|
||||||
public class GathererSets implements Iterable<DownloadJob> {
|
public class GathererSets implements Iterable<DownloadJob> {
|
||||||
private static final File outDir = new File("plugins/images/sets");
|
private static final File outDir = new File("plugins/images/sets");
|
||||||
private static final String[] symbols = {"DIS", "DST", "GPT", "RAV", "MRD", "10E", "HOP", "EVE"};
|
private static final String[] symbols = {"DIS", "DST", "GPT", "RAV", "MRD", "10E", "HOP", "EVE", "APC"};
|
||||||
private static final String[] withMythics = {"ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "M10", "M11", "DDF", "MBS"};
|
private static final String[] withMythics = {"ALA", "CFX", "ARB", "ZEN", "WWK", "ROE", "SOM", "M10", "M11", "DDF", "MBS"};
|
||||||
|
private static final HashMap<String, String> symbolsReplacements = new HashMap<String, String>();
|
||||||
|
|
||||||
|
static {
|
||||||
|
symbolsReplacements.put("CFX", "CON");
|
||||||
|
symbolsReplacements.put("APC", "AP");
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Iterator<DownloadJob> iterator() {
|
public Iterator<DownloadJob> iterator() {
|
||||||
|
@ -34,8 +41,8 @@ public class GathererSets implements Iterable<DownloadJob> {
|
||||||
|
|
||||||
private DownloadJob generateDownloadJob(String set, String rarity) {
|
private DownloadJob generateDownloadJob(String set, String rarity) {
|
||||||
File dst = new File(outDir, set + "-" + rarity + ".jpg");
|
File dst = new File(outDir, set + "-" + rarity + ".jpg");
|
||||||
if (set.equals("CFX")) { // hack for special reserved filaname "CON" in Windows
|
if (symbolsReplacements.containsKey(set)) {
|
||||||
set = "CON";
|
set = symbolsReplacements.get(set);
|
||||||
}
|
}
|
||||||
String url = "http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + set + "&size=small&rarity=" + rarity;
|
String url = "http://gatherer.wizards.com/Handlers/Image.ashx?type=symbol&set=" + set + "&size=small&rarity=" + rarity;
|
||||||
return new DownloadJob(set + "-" + rarity, fromURL(url), toFile(dst));
|
return new DownloadJob(set + "-" + rarity, fromURL(url), toFile(dst));
|
||||||
|
|
26
Mage.Sets/src/mage/sets/Apocalypse.java
Normal file
26
Mage.Sets/src/mage/sets/Apocalypse.java
Normal file
|
@ -0,0 +1,26 @@
|
||||||
|
package mage.sets;
|
||||||
|
|
||||||
|
import mage.Constants;
|
||||||
|
import mage.cards.ExpansionSet;
|
||||||
|
|
||||||
|
import java.util.GregorianCalendar;
|
||||||
|
|
||||||
|
public class Apocalypse extends ExpansionSet {
|
||||||
|
private static final Apocalypse fINSTANCE = new Apocalypse();
|
||||||
|
|
||||||
|
public static Apocalypse getInstance() {
|
||||||
|
return fINSTANCE;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Apocalypse() {
|
||||||
|
super("Apocalypse", "APC", "", "mage.sets.apocalypse", new GregorianCalendar(2009, 5, 1).getTime(), Constants.SetType.EXPANSION);
|
||||||
|
this.blockName = "Invasion ";
|
||||||
|
// this.parentSet =
|
||||||
|
this.hasBoosters = true;
|
||||||
|
this.numBoosterLands = 1;
|
||||||
|
this.numBoosterCommon = 10;
|
||||||
|
this.numBoosterUncommon = 3;
|
||||||
|
this.numBoosterRare = 1;
|
||||||
|
this.ratioBoosterMythic = 8;
|
||||||
|
}
|
||||||
|
}
|
|
@ -16,6 +16,7 @@ public class Darksteel extends ExpansionSet {
|
||||||
public Darksteel() {
|
public Darksteel() {
|
||||||
super("Darksteel", "DST", "", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), Constants.SetType.EXPANSION);
|
super("Darksteel", "DST", "", "mage.sets.darksteel", new GregorianCalendar(2004, 1, 6).getTime(), Constants.SetType.EXPANSION);
|
||||||
this.blockName = "Mirrodin";
|
this.blockName = "Mirrodin";
|
||||||
|
this.parentSet = Mirrodin.getInstance();
|
||||||
this.hasBoosters = true;
|
this.hasBoosters = true;
|
||||||
this.numBoosterLands = 1;
|
this.numBoosterLands = 1;
|
||||||
this.numBoosterCommon = 10;
|
this.numBoosterCommon = 10;
|
||||||
|
|
|
@ -65,6 +65,7 @@ public class Sets extends HashMap<String, ExpansionSet> {
|
||||||
names = new TreeSet<String>();
|
names = new TreeSet<String>();
|
||||||
cards = new ArrayList<Card>();
|
cards = new ArrayList<Card>();
|
||||||
this.addSet(AlaraReborn.getInstance());
|
this.addSet(AlaraReborn.getInstance());
|
||||||
|
this.addSet(Apocalypse.getInstance());
|
||||||
this.addSet(Conflux.getInstance());
|
this.addSet(Conflux.getInstance());
|
||||||
this.addSet(Darksteel.getInstance());
|
this.addSet(Darksteel.getInstance());
|
||||||
this.addSet(Dissension.getInstance());
|
this.addSet(Dissension.getInstance());
|
||||||
|
|
65
Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java
Normal file
65
Mage.Sets/src/mage/sets/apocalypse/DeathGrasp.java
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
/*
|
||||||
|
* 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.apocalypse;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
import mage.Constants.CardType;
|
||||||
|
import mage.Constants.Rarity;
|
||||||
|
import mage.abilities.dynamicvalue.common.ManacostVariableValue;
|
||||||
|
import mage.abilities.effects.common.DamageTargetEffect;
|
||||||
|
import mage.abilities.effects.common.GainLifeEffect;
|
||||||
|
import mage.cards.CardImpl;
|
||||||
|
import mage.target.common.TargetCreatureOrPlayer;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Loki
|
||||||
|
*/
|
||||||
|
public class DeathGrasp extends CardImpl<DeathGrasp> {
|
||||||
|
|
||||||
|
public DeathGrasp (UUID ownerId) {
|
||||||
|
super(ownerId, 95, "Death Grasp", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{X}{W}{B}");
|
||||||
|
this.expansionSetCode = "APC";
|
||||||
|
this.color.setWhite(true);
|
||||||
|
this.color.setBlack(true);
|
||||||
|
this.getSpellAbility().addEffect(new DamageTargetEffect(new ManacostVariableValue()));
|
||||||
|
this.getSpellAbility().addEffect(new GainLifeEffect(new ManacostVariableValue()));
|
||||||
|
this.getSpellAbility().addTarget(new TargetCreatureOrPlayer());
|
||||||
|
}
|
||||||
|
|
||||||
|
public DeathGrasp (final DeathGrasp card) {
|
||||||
|
super(card);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DeathGrasp copy() {
|
||||||
|
return new DeathGrasp(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
135
Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java
Normal file
135
Mage.Sets/src/mage/sets/apocalypse/DesolationAngel.java
Normal file
|
@ -0,0 +1,135 @@
|
||||||
|
/*
|
||||||
|
* 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.apocalypse;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
import mage.Constants;
|
||||||
|
import mage.Constants.CardType;
|
||||||
|
import mage.Constants.Rarity;
|
||||||
|
import mage.MageInt;
|
||||||
|
import mage.abilities.Ability;
|
||||||
|
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
|
||||||
|
import mage.abilities.costs.mana.ManaCostsImpl;
|
||||||
|
import mage.abilities.effects.OneShotEffect;
|
||||||
|
import mage.abilities.keyword.KickerAbility;
|
||||||
|
import mage.cards.CardImpl;
|
||||||
|
import mage.game.Game;
|
||||||
|
import mage.game.permanent.Permanent;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Loki
|
||||||
|
*/
|
||||||
|
public class DesolationAngel extends CardImpl<DesolationAngel> {
|
||||||
|
|
||||||
|
public DesolationAngel (UUID ownerId) {
|
||||||
|
super(ownerId, 38, "Desolation Angel", Rarity.RARE, new CardType[]{CardType.CREATURE}, "{3}{B}{B}");
|
||||||
|
this.expansionSetCode = "APC";
|
||||||
|
this.subtype.add("Angel");
|
||||||
|
this.color.setBlack(true);
|
||||||
|
this.color.setBlack(true);
|
||||||
|
this.power = new MageInt(5);
|
||||||
|
this.toughness = new MageInt(4);
|
||||||
|
Ability ability = new KickerAbility(new DesolationAngelDummyEffect(), false);
|
||||||
|
ability.addManaCost(new ManaCostsImpl("{W}{W}"));
|
||||||
|
this.addAbility(ability);
|
||||||
|
this.addAbility(new EntersBattlefieldTriggeredAbility(new DesolationAngelEntersBattlefieldEffect()));
|
||||||
|
}
|
||||||
|
|
||||||
|
public DesolationAngel (final DesolationAngel card) {
|
||||||
|
super(card);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DesolationAngel copy() {
|
||||||
|
return new DesolationAngel(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class DesolationAngelDummyEffect extends OneShotEffect<DesolationAngelDummyEffect> {
|
||||||
|
DesolationAngelDummyEffect() {
|
||||||
|
super(Constants.Outcome.Benefit);
|
||||||
|
}
|
||||||
|
|
||||||
|
DesolationAngelDummyEffect(final DesolationAngelDummyEffect effect) {
|
||||||
|
super(effect);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean apply(Game game, Ability source) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DesolationAngelDummyEffect copy() {
|
||||||
|
return new DesolationAngelDummyEffect(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class DesolationAngelEntersBattlefieldEffect extends OneShotEffect<DesolationAngelEntersBattlefieldEffect> {
|
||||||
|
DesolationAngelEntersBattlefieldEffect() {
|
||||||
|
super(Constants.Outcome.DestroyPermanent);
|
||||||
|
}
|
||||||
|
|
||||||
|
DesolationAngelEntersBattlefieldEffect(final DesolationAngelEntersBattlefieldEffect effect) {
|
||||||
|
super(effect);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean apply(Game game, Ability source) {
|
||||||
|
Permanent p = game.getPermanent(source.getSourceId());
|
||||||
|
if (p != null) {
|
||||||
|
boolean kicked = false;
|
||||||
|
for (KickerAbility kicker: p.getAbilities().getKickerAbilities()) {
|
||||||
|
kicked |= kicker.isKicked();
|
||||||
|
}
|
||||||
|
for (Permanent permanent : game.getBattlefield().getAllActivePermanents()) {
|
||||||
|
if (permanent.getCardType().contains(CardType.LAND)) {
|
||||||
|
if ((!kicked && permanent.getControllerId() == source.getControllerId()) || kicked) {
|
||||||
|
permanent.destroy(source.getSourceId(), game, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public DesolationAngelEntersBattlefieldEffect copy() {
|
||||||
|
return new DesolationAngelEntersBattlefieldEffect(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getText(Ability source) {
|
||||||
|
return "destroy all lands you control. If it was kicked, destroy all lands instead";
|
||||||
|
}
|
||||||
|
}
|
62
Mage.Sets/src/mage/sets/apocalypse/Vindicate.java
Normal file
62
Mage.Sets/src/mage/sets/apocalypse/Vindicate.java
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
/*
|
||||||
|
* 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.apocalypse;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
import mage.Constants.CardType;
|
||||||
|
import mage.Constants.Rarity;
|
||||||
|
import mage.abilities.effects.common.DestroyTargetEffect;
|
||||||
|
import mage.cards.CardImpl;
|
||||||
|
import mage.target.TargetPermanent;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @author Loki
|
||||||
|
*/
|
||||||
|
public class Vindicate extends CardImpl<Vindicate> {
|
||||||
|
|
||||||
|
public Vindicate (UUID ownerId) {
|
||||||
|
super(ownerId, 126, "Vindicate", Rarity.RARE, new CardType[]{CardType.SORCERY}, "{1}{W}{B}");
|
||||||
|
this.expansionSetCode = "APC";
|
||||||
|
this.color.setWhite(true);
|
||||||
|
this.color.setBlack(true);
|
||||||
|
this.getSpellAbility().addEffect(new DestroyTargetEffect());
|
||||||
|
this.getSpellAbility().addTarget(new TargetPermanent());
|
||||||
|
}
|
||||||
|
|
||||||
|
public Vindicate (final Vindicate card) {
|
||||||
|
super(card);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Vindicate copy() {
|
||||||
|
return new Vindicate(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -30,6 +30,8 @@ package mage.abilities.effects.common;
|
||||||
|
|
||||||
import mage.Constants.Outcome;
|
import mage.Constants.Outcome;
|
||||||
import mage.abilities.Ability;
|
import mage.abilities.Ability;
|
||||||
|
import mage.abilities.dynamicvalue.DynamicValue;
|
||||||
|
import mage.abilities.dynamicvalue.common.StaticValue;
|
||||||
import mage.abilities.effects.OneShotEffect;
|
import mage.abilities.effects.OneShotEffect;
|
||||||
import mage.game.Game;
|
import mage.game.Game;
|
||||||
import mage.game.permanent.Permanent;
|
import mage.game.permanent.Permanent;
|
||||||
|
@ -41,26 +43,38 @@ import mage.players.Player;
|
||||||
*/
|
*/
|
||||||
public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
|
public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
|
||||||
|
|
||||||
protected int amount;
|
protected DynamicValue amount;
|
||||||
protected boolean preventable;
|
protected boolean preventable;
|
||||||
|
|
||||||
public DamageTargetEffect(int amount) {
|
public DamageTargetEffect(int amount) {
|
||||||
this(amount, true);
|
this(new StaticValue(amount), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
public DamageTargetEffect(int amount, boolean preventable) {
|
public DamageTargetEffect(int amount, boolean preventable) {
|
||||||
|
this(new StaticValue(amount), preventable);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DamageTargetEffect(DynamicValue amount) {
|
||||||
|
this(amount, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
public DamageTargetEffect(DynamicValue amount, boolean preventable) {
|
||||||
super(Outcome.Damage);
|
super(Outcome.Damage);
|
||||||
this.amount = amount;
|
this.amount = amount;
|
||||||
this.preventable = preventable;
|
this.preventable = preventable;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getAmount() {
|
public int getAmount() {
|
||||||
return amount;
|
if (amount instanceof StaticValue) {
|
||||||
|
return amount.calculate(null, null);
|
||||||
|
} else {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public DamageTargetEffect(final DamageTargetEffect effect) {
|
public DamageTargetEffect(final DamageTargetEffect effect) {
|
||||||
super(effect);
|
super(effect);
|
||||||
this.amount = effect.amount;
|
this.amount = effect.amount.clone();
|
||||||
this.preventable = effect.preventable;
|
this.preventable = effect.preventable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -73,12 +87,12 @@ public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
|
||||||
public boolean apply(Game game, Ability source) {
|
public boolean apply(Game game, Ability source) {
|
||||||
Permanent permanent = game.getPermanent(source.getFirstTarget());
|
Permanent permanent = game.getPermanent(source.getFirstTarget());
|
||||||
if (permanent != null) {
|
if (permanent != null) {
|
||||||
permanent.damage(amount, source.getSourceId(), game, preventable, false);
|
permanent.damage(amount.calculate(game, source), source.getSourceId(), game, preventable, false);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Player player = game.getPlayer(source.getFirstTarget());
|
Player player = game.getPlayer(source.getFirstTarget());
|
||||||
if (player != null) {
|
if (player != null) {
|
||||||
player.damage(amount, source.getSourceId(), game, false, preventable);
|
player.damage(amount.calculate(game, source), source.getSourceId(), game, false, preventable);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
|
@ -87,7 +101,7 @@ public class DamageTargetEffect extends OneShotEffect<DamageTargetEffect> {
|
||||||
@Override
|
@Override
|
||||||
public String getText(Ability source) {
|
public String getText(Ability source) {
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
sb.append("{source} deals ").append(Integer.toString(amount)).append(" damage to target ");
|
sb.append("{source} deals ").append(amount).append(" damage to target ");
|
||||||
sb.append(source.getTargets().get(0).getTargetName());
|
sb.append(source.getTargets().get(0).getTargetName());
|
||||||
if (!preventable)
|
if (!preventable)
|
||||||
sb.append(". The damage can't be prevented");
|
sb.append(". The damage can't be prevented");
|
||||||
|
|
|
@ -214,6 +214,7 @@ $wizardstous{'MBS'} = 'MBS';
|
||||||
|
|
||||||
my %knownSets;
|
my %knownSets;
|
||||||
$knownSets{'ARB'} = 'alarareborn';
|
$knownSets{'ARB'} = 'alarareborn';
|
||||||
|
$knownSets{'APC'} = 'apocalypse';
|
||||||
$knownSets{'CON'} = 'conflux';
|
$knownSets{'CON'} = 'conflux';
|
||||||
$knownSets{'DST'} = 'darksteel';
|
$knownSets{'DST'} = 'darksteel';
|
||||||
$knownSets{'EVE'} = 'eventide';
|
$knownSets{'EVE'} = 'eventide';
|
||||||
|
|
Loading…
Reference in a new issue