github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-25 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Some minor changes.

Browse source
This commit is contained in:
LevelX2 2014-10-27 18:26:33 +01:00
parent b1a41b9221
commit aff9eb4c33
4 changed files with 72 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

87
Mage.Sets/src/mage/sets/conspiracy/AcademyElite.java
View file

@ -1,5 +1,34 @@
/*
* 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.conspiracy; package mage.sets.conspiracy;
import java.util.UUID;
import mage.MageInt; import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.SpellAbility; import mage.abilities.SpellAbility;
@ -22,8 +51,6 @@ import mage.game.Game;
import mage.game.permanent.Permanent; import mage.game.permanent.Permanent;
import mage.target.common.TargetCreatureOrPlayer; import mage.target.common.TargetCreatureOrPlayer;
import java.util.UUID;
/** /**
* *
* @author andyfries * @author andyfries
@ -41,15 +68,15 @@ public class AcademyElite extends CardImpl {
// Academy Elite enters the battlefield with X +1/+1 counters on it, where X is the number of instant and // Academy Elite enters the battlefield with X +1/+1 counters on it, where X is the number of instant and
// sorcery cards in all graveyards. // sorcery cards in all graveyards.
this.addAbility(new EntersBattlefieldAbility(new AcademyEliteEffect1(), " with X +1/+1 counters on it, where X is the number of instant and sorcery cards in all graveyards")); this.addAbility(new EntersBattlefieldAbility(new AcademyEliteEffect1(), "with X +1/+1 counters on it, where X is the number of instant and sorcery cards in all graveyards"));
// {2}{U}, Remove a +1/+1 counter from Academy Elite: Draw a card, then discard a card. // {2}{U}, Remove a +1/+1 counter from Academy Elite: Draw a card, then discard a card.
Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl<>("{2}{U}")); Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(1, 1, false), new ManaCostsImpl("{2}{U}"));
ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1))); ability.addCost(new RemoveCountersSourceCost(CounterType.P1P1.createInstance(1)));
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability); this.addAbility(ability);
} }
public AcademyElite(final AcademyElite card) { public AcademyElite(final AcademyElite card) {
super(card); super(card);
} }
@ -59,36 +86,38 @@ public class AcademyElite extends CardImpl {
return new AcademyElite(this); return new AcademyElite(this);
} }
class AcademyEliteEffect1 extends OneShotEffect { }
public AcademyEliteEffect1() { class AcademyEliteEffect1 extends OneShotEffect {
super(Outcome.BoostCreature);
staticText = "{this} enters the battlefield with X +1/+1 counters on it, where X is the number of instant and sorcery cards in all graveyards";
}
public AcademyEliteEffect1(final AcademyEliteEffect1 effect) { public AcademyEliteEffect1() {
super(effect); super(Outcome.BoostCreature);
} staticText = "{this} enters the battlefield with X +1/+1 counters on it, where X is the number of instant and sorcery cards in all graveyards";
}
@Override public AcademyEliteEffect1(final AcademyEliteEffect1 effect) {
public boolean apply(Game game, Ability source) { super(effect);
Permanent permanent = game.getPermanent(source.getSourceId()); }
if (permanent != null) {
Object obj = getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY); @Override
if (obj != null && obj instanceof SpellAbility) { public boolean apply(Game game, Ability source) {
CardsInAllGraveyardsCount instantsAndSorceries = new CardsInAllGraveyardsCount(new FilterInstantOrSorceryCard("instant or sorcery cards")); Permanent permanent = game.getPermanent(source.getSourceId());
int instantsAndSorceriesCount = instantsAndSorceries.calculate(game, source, this); if (permanent != null) {
if (instantsAndSorceriesCount > 0) { Object obj = getValue(EntersBattlefieldEffect.SOURCE_CAST_SPELL_ABILITY);
permanent.addCounters(CounterType.P1P1.createInstance(instantsAndSorceriesCount), game); if (obj != null && obj instanceof SpellAbility) {
} CardsInAllGraveyardsCount instantsAndSorceries = new CardsInAllGraveyardsCount(new FilterInstantOrSorceryCard("instant or sorcery cards"));
int instantsAndSorceriesCount = instantsAndSorceries.calculate(game, source, this);
if (instantsAndSorceriesCount > 0) {
permanent.addCounters(CounterType.P1P1.createInstance(instantsAndSorceriesCount), game);
} }
} }
return true;
} }
return true;
}
@Override @Override
public AcademyEliteEffect1 copy() { public AcademyEliteEffect1 copy() {
return new AcademyEliteEffect1(this); return new AcademyEliteEffect1(this);
}
} }
} }

14
Mage.Sets/src/mage/sets/fifthdawn/Acquire.java
View file

@ -52,7 +52,7 @@ class AcquireEffect extends OneShotEffect {
} }
public AcquireEffect() { public AcquireEffect() {
super(Outcome.Benefit); super(Outcome.PutCardInPlay);
staticText = "Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library"; staticText = "Search target opponent's library for an artifact card and put that card onto the battlefield under your control. Then that player shuffles his or her library";
} }
@ -62,19 +62,19 @@ class AcquireEffect extends OneShotEffect {
@Override @Override
public boolean apply(Game game, Ability source) { public boolean apply(Game game, Ability source) {
boolean applied = false;
Player opponent = game.getPlayer(source.getFirstTarget()); Player opponent = game.getPlayer(source.getFirstTarget());
Player you = game.getPlayer(source.getControllerId()); Player controller = game.getPlayer(source.getControllerId());
if (opponent != null && you != null) { if (opponent != null && controller != null) {
TargetCardInLibrary target = new TargetCardInLibrary(filter); TargetCardInLibrary target = new TargetCardInLibrary(filter);
you.searchLibrary(target, game, opponent.getId()); controller.searchLibrary(target, game, opponent.getId());
Card targetCard = game.getCard(target.getFirstTarget()); Card targetCard = game.getCard(target.getFirstTarget());
if (targetCard != null) { if (targetCard != null) {
applied = you.putOntoBattlefieldWithInfo(targetCard, game, Zone.LIBRARY, source.getSourceId()); controller.putOntoBattlefieldWithInfo(targetCard, game, Zone.LIBRARY, source.getSourceId());
} }
opponent.shuffleLibrary(game); opponent.shuffleLibrary(game);
return true;
} }
return applied; return false;
} }
@Override @Override

2
Mage.Sets/src/mage/sets/ninthedition/Annex.java
View file

@ -31,7 +31,7 @@ import java.util.UUID;
/** /**
* *
* @author anonymous * @author andyfries
*/ */
public class Annex extends mage.sets.onslaught.Annex { public class Annex extends mage.sets.onslaught.Annex {

16
Mage.Sets/src/mage/sets/onslaught/Annex.java
View file

@ -28,19 +28,16 @@
package mage.sets.onslaught; package mage.sets.onslaught;
import java.util.UUID; import java.util.UUID;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.costs.common.TapSourceCost;
import mage.abilities.effects.common.AttachEffect; import mage.abilities.effects.common.AttachEffect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.continious.ControlEnchantedEffect; import mage.abilities.effects.common.continious.ControlEnchantedEffect;
import mage.abilities.effects.common.continious.GainAbilityAttachedEffect;
import mage.abilities.keyword.EnchantAbility; import mage.abilities.keyword.EnchantAbility;
import mage.cards.CardImpl; import mage.cards.CardImpl;
import mage.constants.*; import mage.constants.CardType;
import mage.game.permanent.token.SquirrelToken; import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.target.TargetPermanent; import mage.target.TargetPermanent;
import mage.target.common.TargetLandPermanent; import mage.target.common.TargetLandPermanent;
@ -60,13 +57,12 @@ public class Annex extends CardImpl {
// Enchant land // Enchant land
TargetPermanent auraTarget = new TargetLandPermanent(); TargetPermanent auraTarget = new TargetLandPermanent();
this.getSpellAbility().addTarget(auraTarget); this.getSpellAbility().addTarget(auraTarget);
this.getSpellAbility().addEffect(new AttachEffect(Outcome.AddAbility)); this.getSpellAbility().addEffect(new AttachEffect(Outcome.GainControl));
Ability ability = new EnchantAbility(auraTarget.getTargetName()); Ability ability = new EnchantAbility(auraTarget.getTargetName());
this.addAbility(ability); this.addAbility(ability);
// You control enchanted land. // You control enchanted land.
Ability controlAbility = new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect()); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ControlEnchantedEffect()));
this.addAbility(controlAbility);
} }
public Annex(final Annex card) { public Annex(final Annex card) {