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

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-01-07 23:54:00 +01:00
commit 13659e064c
3 changed files with 70 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/m/MerchantsDockhand.java
View file

@ -145,7 +145,7 @@ class TapXTargetCost extends VariableCostImpl {
} }
public TapXTargetCost() { public TapXTargetCost() {
super("controlled untapped artifacts you like to tap"); super("controlled untapped artifacts you would like to tap");
this.text = "Tap X untapped artifacts you control"; this.text = "Tap X untapped artifacts you control";
} }

131
Mage.Sets/src/mage/cards/p/PreciseStrike.java
View file

@ -1,63 +1,68 @@
/* /*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved. * Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without modification, are * Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met: * permitted provided that the following conditions are met:
* *
* 1. Redistributions of source code must retain the above copyright notice, this list of * 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer. * conditions and the following disclaimer.
* *
* 2. Redistributions in binary form must reproduce the above copyright notice, this list * 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 * of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution. * provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED * 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 * 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 * 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 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 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 * 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 * 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 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* The views and conclusions contained in the software and documentation are those of the * 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 * authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com. * or implied, of BetaSteward_at_googlemail.com.
*/ */
package mage.cards.p; package mage.cards.p;
import java.util.UUID; import java.util.UUID;
import mage.abilities.effects.common.continuous.BoostTargetEffect; import mage.abilities.effects.Effect;
import mage.abilities.effects.common.continuous.GainAbilityTargetEffect; import mage.abilities.effects.common.continuous.BoostTargetEffect;
import mage.abilities.keyword.FirstStrikeAbility; import mage.abilities.effects.common.continuous.GainAbilityTargetEffect;
import mage.cards.CardImpl; import mage.abilities.keyword.FirstStrikeAbility;
import mage.cards.CardSetInfo; import mage.cards.CardImpl;
import mage.constants.CardType; import mage.cards.CardSetInfo;
import mage.constants.Duration; import mage.constants.CardType;
import mage.target.common.TargetCreaturePermanent; import mage.constants.Duration;
import mage.target.common.TargetCreaturePermanent;
/**
* /**
* @author Styxo *
*/ * @author Styxo
public class PreciseStrike extends CardImpl { */
public class PreciseStrike extends CardImpl {
public PreciseStrike(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}"); public PreciseStrike(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{R}");
// Target creature gets +1/+0 and gains first strike until end of turn.
this.getSpellAbility().addEffect(new BoostTargetEffect(1, 0, Duration.EndOfTurn)); // Target creature gets +1/+0 and gains first strike until end of turn.
this.getSpellAbility().addEffect(new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn)); Effect effect = new BoostTargetEffect(1, 0, Duration.EndOfTurn);
this.getSpellAbility().addTarget(new TargetCreaturePermanent()); effect.setText("Target creature gets +1/+0");
} this.getSpellAbility().addEffect(effect);
effect = new GainAbilityTargetEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn);
public PreciseStrike(final PreciseStrike card) { effect.setText("and gains first strike until end of turn");
super(card); this.getSpellAbility().addEffect(effect);
} this.getSpellAbility().addTarget(new TargetCreaturePermanent());
}
@Override
public PreciseStrike copy() { public PreciseStrike(final PreciseStrike card) {
return new PreciseStrike(this); super(card);
} }
}
@Override
public PreciseStrike copy() {
return new PreciseStrike(this);
}
}

2
Mage.Sets/src/mage/cards/r/RishkarPeemaRenegade.java
View file

@ -52,7 +52,7 @@ import mage.target.common.TargetCreaturePermanent;
*/ */
public class RishkarPeemaRenegade extends CardImpl { public class RishkarPeemaRenegade extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature with a counter on it"); private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Each creature with a counter on it");
static { static {
filter.add(new CounterAnyPredicate()); filter.add(new CounterAnyPredicate());