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

Use ChosenSubtypePredicate for some existing cards

Browse source
This commit is contained in:
LoneFox 2015-07-28 12:57:49 +03:00
parent 0e51c1fcf4
commit 1427227445
3 changed files with 33 additions and 149 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
Mage.Sets/src/mage/sets/magic2012/AdaptiveAutomaton.java
View file

@ -27,24 +27,31 @@
*/
package mage.sets.magic2012;
import mage.constants.*;
import java.util.UUID;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.AsEntersBattlefieldAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ContinuousEffectImpl;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.ChooseCreatureTypeEffect;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.cards.CardImpl;
import mage.cards.repository.CardRepository;
import mage.choices.Choice;
import mage.choices.ChoiceImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Layer;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.SubLayer;
import mage.constants.TargetController;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.filter.predicate.mageobject.ChosenSubtypePredicate;
import mage.filter.predicate.permanent.AnotherPredicate;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
import java.util.UUID;
/**
* @author nantuko
*/
@ -59,11 +66,15 @@ public class AdaptiveAutomaton extends CardImpl {
this.toughness = new MageInt(2);
// As Adaptive Automaton enters the battlefield, choose a creature type.
this.addAbility(new AsEntersBattlefieldAbility(new AdaptiveAutomatonEffect()));
this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature)));
// Adaptive Automaton is the chosen type in addition to its other types.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AdaptiveAutomatonAddSubtypeEffect()));
// Other creatures you control of the chosen type get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new AdaptiveAutomatonBoostControlledEffect()));
FilterCreaturePermanent filter = new FilterCreaturePermanent("Other creatures you control of the chosen type");
filter.add(new ChosenSubtypePredicate(this.getId()));
filter.add(new AnotherPredicate());
filter.add(new ControllerPredicate(TargetController.YOU));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)));
}
public AdaptiveAutomaton(final AdaptiveAutomaton card) {
@ -76,43 +87,6 @@ public class AdaptiveAutomaton extends CardImpl {
}
}
class AdaptiveAutomatonEffect extends OneShotEffect {
public AdaptiveAutomatonEffect() {
super(Outcome.BoostCreature);
staticText = "choose a creature type";
}
public AdaptiveAutomatonEffect(final AdaptiveAutomatonEffect effect) {
super(effect);
}
@Override
public boolean apply(Game game, Ability source) {
Player player = game.getPlayer(source.getControllerId());
Permanent permanent = game.getPermanent(source.getSourceId());
if (player != null && permanent != null) {
Choice typeChoice = new ChoiceImpl(true);
typeChoice.setMessage("Choose creature type");
typeChoice.setChoices(CardRepository.instance.getCreatureTypes());
while (!player.choose(Outcome.BoostCreature, typeChoice, game)) {
if (!player.isInGame()) {
return false;
}
}
game.informPlayers(permanent.getName() + ": " + player.getLogName() + " has chosen " + typeChoice.getChoice());
game.getState().setValue(permanent.getId() + "_type", typeChoice.getChoice());
permanent.addInfo("chosen type", "<i>Chosen type: " + typeChoice.getChoice().toString() + "</i>", game);
}
return false;
}
@Override
public AdaptiveAutomatonEffect copy() {
return new AdaptiveAutomatonEffect(this);
}
}
class AdaptiveAutomatonAddSubtypeEffect extends ContinuousEffectImpl {
public AdaptiveAutomatonAddSubtypeEffect() {
@ -141,40 +115,3 @@ class AdaptiveAutomatonAddSubtypeEffect extends ContinuousEffectImpl {
return new AdaptiveAutomatonAddSubtypeEffect(this);
}
}
class AdaptiveAutomatonBoostControlledEffect extends ContinuousEffectImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
public AdaptiveAutomatonBoostControlledEffect() {
super(Duration.WhileOnBattlefield, Layer.PTChangingEffects_7, SubLayer.ModifyPT_7c, Outcome.BoostCreature);
staticText = "Other creatures you control of the chosen type get +1/+1";
}
public AdaptiveAutomatonBoostControlledEffect(final AdaptiveAutomatonBoostControlledEffect effect) {
super(effect);
}
@Override
public AdaptiveAutomatonBoostControlledEffect copy() {
return new AdaptiveAutomatonBoostControlledEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
Permanent permanent = game.getPermanent(source.getSourceId());
if (permanent != null) {
String subtype = (String) game.getState().getValue(permanent.getId() + "_type");
if (subtype != null) {
for (Permanent perm: game.getBattlefield().getAllActivePermanents(filter, source.getControllerId(), game)) {
if (!perm.getId().equals(source.getSourceId()) && perm.hasSubtype(subtype)) {
perm.addPower(1);
perm.addToughness(1);
}
}
}
}
return true;
}
}

36
Mage.Sets/src/mage/sets/onslaught/SharedTriumph.java
View file

@ -39,8 +39,7 @@ import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.filter.predicate.mageobject.ChosenSubtypePredicate;
/**
*
@ -55,9 +54,10 @@ public class SharedTriumph extends CardImpl {
// As Shared Triumph enters the battlefield, choose a creature type.
this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.BoostCreature)));
// Creatures of the chosen type get +1/+1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, new FilterSharedTriumph(), false)));
FilterCreaturePermanent filter = new FilterCreaturePermanent("Creatures of the chosen type");
filter.add(new ChosenSubtypePredicate(this.getId()));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(1, 1, Duration.WhileOnBattlefield, filter, false)));
}
public SharedTriumph(final SharedTriumph card) {
@ -69,31 +69,3 @@ public class SharedTriumph extends CardImpl {
return new SharedTriumph(this);
}
}
class FilterSharedTriumph extends FilterCreaturePermanent {
public FilterSharedTriumph() {
super("Creatures of the chosen type");
}
public FilterSharedTriumph(final FilterSharedTriumph filter) {
super(filter);
}
@Override
public FilterSharedTriumph copy() {
return new FilterSharedTriumph(this);
}
@Override
public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
if(super.match(permanent, sourceId, playerId, game)){
String subtype = (String) game.getState().getValue(sourceId + "_type");
if(subtype != null && !subtype.equals("") && permanent.hasSubtype(subtype)){
return true;
}
}
return false;
}
}

43
Mage.Sets/src/mage/sets/urzaslegacy/EngineeredPlague.java
View file

@ -28,16 +28,18 @@
package mage.sets.urzaslegacy;
import java.util.UUID;
import mage.constants.*;
import mage.abilities.common.AsEntersBattlefieldAbility;
import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.common.ChooseCreatureTypeEffect;
import mage.abilities.effects.common.continuous.BoostAllEffect;
import mage.cards.CardImpl;
import mage.constants.CardType;
import mage.constants.Duration;
import mage.constants.Outcome;
import mage.constants.Rarity;
import mage.constants.Zone;
import mage.filter.common.FilterCreaturePermanent;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.filter.predicate.mageobject.ChosenSubtypePredicate;
/**
*
@ -53,7 +55,9 @@ public class EngineeredPlague extends CardImpl {
// As Engineered Plague enters the battlefield, choose a creature type.
this.addAbility(new AsEntersBattlefieldAbility(new ChooseCreatureTypeEffect(Outcome.UnboostCreature)));
// All creatures of the chosen type get -1/-1.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, new FilterEngineeredPlague(), false)));
FilterCreaturePermanent filter = new FilterCreaturePermanent("All creatures of the chosen type");
filter.add(new ChosenSubtypePredicate(this.getId()));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BoostAllEffect(-1, -1, Duration.WhileOnBattlefield, filter, false)));
}
public EngineeredPlague(final EngineeredPlague card) {
@ -64,33 +68,4 @@ public class EngineeredPlague extends CardImpl {
public EngineeredPlague copy() {
return new EngineeredPlague(this);
}
class FilterEngineeredPlague extends FilterCreaturePermanent {
public FilterEngineeredPlague() {
super("All creatures of the chosen type");
}
public FilterEngineeredPlague(final FilterEngineeredPlague filter) {
super(filter);
}
@Override
public FilterEngineeredPlague copy() {
return new FilterEngineeredPlague(this);
}
@Override
public boolean match(Permanent permanent, UUID sourceId, UUID playerId, Game game) {
if(super.match(permanent, sourceId, playerId, game)){
String subtype = (String) game.getState().getValue(sourceId + "_type");
if(subtype != null && !subtype.equals("") && permanent.hasSubtype(subtype)){
return true;
}
}
return false;
}
}
}