Merge remote-tracking branch 'upstream/master'

This commit is contained in:
ninthworld 2018-07-23 16:09:53 -07:00
commit 19d1ff2657
14 changed files with 591 additions and 69 deletions

View file

@ -8,7 +8,9 @@ import mage.abilities.dynamicvalue.DynamicValue;
import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.OneShotEffect;
import mage.constants.Outcome;
import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.filter.predicate.permanent.ControllerPredicate;
import mage.game.Game;
import mage.game.permanent.Permanent;
import mage.players.Player;
@ -36,7 +38,8 @@ public class SacrificeOpponentsEffect extends OneShotEffect {
public SacrificeOpponentsEffect(DynamicValue amount, FilterPermanent filter) {
super(Outcome.Sacrifice);
this.amount = amount;
this.filter = filter;
this.filter = filter.copy();
this.filter.add(new ControllerPredicate(TargetController.YOU));
setText();
}

View file

@ -0,0 +1,34 @@
package mage.game.permanent.token;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.MageInt;
/**
*
* @author TheElk801
*/
public final class RetrofitterFoundryToken extends TokenImpl {
public RetrofitterFoundryToken() {
this("C18");
}
public RetrofitterFoundryToken(String setCode) {
super("Construct", "4/4 colorless Construct artifact creature token");
this.setOriginalExpansionSetCode(setCode);
cardType.add(CardType.ARTIFACT);
cardType.add(CardType.CREATURE);
subtype.add(SubType.CONSTRUCT);
power = new MageInt(4);
toughness = new MageInt(4);
}
public RetrofitterFoundryToken(final RetrofitterFoundryToken token) {
super(token);
}
public RetrofitterFoundryToken copy() {
return new RetrofitterFoundryToken(this);
}
}