External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-24 12:19:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Code Deduplication

Browse source 
Move the cast from hand effect from the expertise cards to its own effect that can have different values assigned to it.
This commit is contained in:
Justin Herlehy 2017-01-03 23:49:16 -05:00
parent 27c0432895
commit 1c6914398b
4 changed files with 123 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Mage.Sets/src/mage/cards/r/RishkarsExpertise.java
View file

@ -25,28 +25,24 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.r;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.cards.Card;
import mage.abilities.effects.common.cost.CastWithoutPayingManaCostEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.filter.Filter;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.common.FilterNonlandCard;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCardInHand;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public class RishkarsExpertise extends CardImpl {
@ -56,10 +52,10 @@ public class RishkarsExpertise extends CardImpl {
// Draw cards equal to the greatest power among creatures you control.
getSpellAbility().addEffect(new RishkarsExpertiseDrawEffect());
this.getSpellAbility().addEffect(new RishkarsExpertiseDrawEffect());
// You may cast a card with converted mana cost 5 or less from your hand without paying its mana cost.
getSpellAbility().addEffect(new RishkarsExpertiseCastEffect());
this.getSpellAbility().addEffect(new CastWithoutPayingManaCostEffect(5));
}
public RishkarsExpertise(final RishkarsExpertise card) {
@ -105,54 +101,3 @@ class RishkarsExpertiseDrawEffect extends OneShotEffect {
}
}
class RishkarsExpertiseCastEffect extends OneShotEffect {
private static final FilterNonlandCard filter = new FilterNonlandCard("card with converted mana cost 5 or less from your hand");
static {
filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 6));
}
public RishkarsExpertiseCastEffect() {
super(Outcome.PlayForFree);
this.staticText = "you may cast a card with converted mana cost 5 or less from your hand without paying its mana cost";
}
public RishkarsExpertiseCastEffect(final RishkarsExpertiseCastEffect effect) {
super(effect);
}
@Override
public RishkarsExpertiseCastEffect copy() {
return new RishkarsExpertiseCastEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Target target = new TargetCardInHand(filter);
if (target.canChoose(source.getSourceId(), controller.getId(), game) &&
controller.chooseUse(outcome, "Cast a card with converted mana cost 5 or less from your hand without paying its mana cost?", source, game)) {
Card cardToCast = null;
boolean cancel = false;
while (controller.canRespond() && !cancel) {
if (controller.chooseTarget(outcome, target, source, game)) {
cardToCast = game.getCard(target.getFirstTarget());
if (cardToCast != null && cardToCast.getSpellAbility().canChooseTarget(game)) {
cancel = true;
}
} else {
cancel = true;
}
}
if (cardToCast != null) {
controller.cast(cardToCast.getSpellAbility(), game, true);
}
}
return true;
}
return false;
}
}

72
Mage.Sets/src/mage/cards/s/SramsExpertise.java
View file

@ -25,28 +25,19 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.s;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.cards.Card;
import mage.abilities.effects.common.cost.CastWithoutPayingManaCostEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.filter.Filter;
import mage.filter.common.FilterNonlandCard;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.game.Game;
import mage.game.permanent.token.ServoToken;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCardInHand;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public class SramsExpertise extends CardImpl {
@ -56,10 +47,10 @@ public class SramsExpertise extends CardImpl {
// Create three 1/1 colorless Servo artifact creature tokens.
getSpellAbility().addEffect(new CreateTokenEffect(new ServoToken(), 3));
this.getSpellAbility().addEffect(new CreateTokenEffect(new ServoToken(), 3));
// You may cast a card with converted mana cost 3 or less from your hand without paying its mana cost.
getSpellAbility().addEffect(new SramsExpertiseCastEffect());
this.getSpellAbility().addEffect(new CastWithoutPayingManaCostEffect(3));
}
public SramsExpertise(final SramsExpertise card) {
@ -71,54 +62,3 @@ public class SramsExpertise extends CardImpl {
return new SramsExpertise(this);
}
}
class SramsExpertiseCastEffect extends OneShotEffect {
private static final FilterNonlandCard filter = new FilterNonlandCard("card with converted mana cost 3 or less from your hand");
static {
filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 4));
}
public SramsExpertiseCastEffect() {
super(Outcome.PlayForFree);
this.staticText = "you may cast a card with converted mana cost 3 or less from your hand without paying its mana cost";
}
public SramsExpertiseCastEffect(final SramsExpertiseCastEffect effect) {
super(effect);
}
@Override
public SramsExpertiseCastEffect copy() {
return new SramsExpertiseCastEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Target target = new TargetCardInHand(filter);
if (target.canChoose(source.getSourceId(), controller.getId(), game) &&
controller.chooseUse(outcome, "Cast a card with converted mana cost 3 or less from your hand without paying its mana cost?", source, game)) {
Card cardToCast = null;
boolean cancel = false;
while (controller.canRespond() && !cancel) {
if (controller.chooseTarget(outcome, target, source, game)) {
cardToCast = game.getCard(target.getFirstTarget());
if (cardToCast != null && cardToCast.getSpellAbility().canChooseTarget(game)) {
cancel = true;
}
} else {
cancel = true;
}
}
if (cardToCast != null) {
controller.cast(cardToCast.getSpellAbility(), game, true);
}
}
return true;
}
return false;
}
}

72
Mage.Sets/src/mage/cards/y/YahennisExpertise.java
View file

@ -25,28 +25,19 @@
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.cards.y;
import java.util.UUID;
import mage.abilities.Ability;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.cards.Card;
import mage.abilities.effects.common.cost.CastWithoutPayingManaCostEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.filter.Filter;
import mage.filter.common.FilterNonlandCard;
import mage.filter.predicate.mageobject.ConvertedManaCostPredicate;
import mage.game.Game;
import mage.players.Player;
import mage.target.Target;
import mage.target.common.TargetCardInHand;
import java.util.UUID;
/**
*
* @author fireshoes
*/
public class YahennisExpertise extends CardImpl {
@ -56,10 +47,10 @@ public class YahennisExpertise extends CardImpl {
// All creatures get -3/-3 until end of turn.
getSpellAbility().addEffect(new BoostAllEffect(-3, -3, Duration.EndOfTurn));
this.getSpellAbility().addEffect(new BoostAllEffect(-3, -3, Duration.EndOfTurn));
// You may cast a card with converted mana cost 3 or less from your hand without paying its mana cost.
getSpellAbility().addEffect(new YahennisExpertiseCastEffect());
this.getSpellAbility().addEffect(new CastWithoutPayingManaCostEffect(3));
}
public YahennisExpertise(final YahennisExpertise card) {
@ -71,54 +62,3 @@ public class YahennisExpertise extends CardImpl {
return new YahennisExpertise(this);
}
}
class YahennisExpertiseCastEffect extends OneShotEffect {
private static final FilterNonlandCard filter = new FilterNonlandCard("card with converted mana cost 3 or less from your hand");
static {
filter.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 4));
}
public YahennisExpertiseCastEffect() {
super(Outcome.PlayForFree);
this.staticText = "you may cast a card with converted mana cost 3 or less from your hand without paying its mana cost";
}
public YahennisExpertiseCastEffect(final YahennisExpertiseCastEffect effect) {
super(effect);
}
@Override
public YahennisExpertiseCastEffect copy() {
return new YahennisExpertiseCastEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
if (controller != null) {
Target target = new TargetCardInHand(filter);
if (target.canChoose(source.getSourceId(), controller.getId(), game) &&
controller.chooseUse(outcome, "Cast a card with converted mana cost 3 or less from your hand without paying its mana cost?", source, game)) {
Card cardToCast = null;
boolean cancel = false;
while (controller.canRespond() && !cancel) {
if (controller.chooseTarget(outcome, target, source, game)) {
cardToCast = game.getCard(target.getFirstTarget());
if (cardToCast != null && cardToCast.getSpellAbility().canChooseTarget(game)) {
cancel = true;
}
} else {
cancel = true;
}
}
if (cardToCast != null) {
controller.cast(cardToCast.getSpellAbility(), game, true);
}
}
return true;
}
return false;
}
}