github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-16 17:00:13 -09:00
Code Issues Projects Releases Packages Wiki Activity

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2018-01-07 22:12:16 +01:00
commit b089a8a872
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -121,7 +121,7 @@ public class HumanPlayer extends PlayerImpl {
public HumanPlayer(final HumanPlayer player) { public HumanPlayer(final HumanPlayer player) {
super(player); super(player);
this.replacementEffectChoice = player.replacementEffectChoice; this.replacementEffectChoice = player.replacementEffectChoice;
this.autoSelectReplacementEffects.addAll(autoSelectReplacementEffects); this.autoSelectReplacementEffects.addAll(player.autoSelectReplacementEffects);
this.currentlyUnpaidMana = player.currentlyUnpaidMana; this.currentlyUnpaidMana = player.currentlyUnpaidMana;
this.triggerAutoOrderAbilityFirst.addAll(player.triggerAutoOrderAbilityFirst); this.triggerAutoOrderAbilityFirst.addAll(player.triggerAutoOrderAbilityFirst);

20
Mage.Sets/src/mage/cards/k/KumenaTyrantOfOrazca.java
View file

@ -55,17 +55,17 @@ import mage.target.common.TargetControlledPermanent;
*/ */
public class KumenaTyrantOfOrazca extends CardImpl { public class KumenaTyrantOfOrazca extends CardImpl {
private static final FilterControlledPermanent filterAnother = new FilterControlledPermanent("another untapped Merfolk you control"); private static final FilterControlledPermanent filterAnotherNotTapped = new FilterControlledPermanent("another untapped Merfolk you control");
private static final FilterControlledPermanent filter = new FilterControlledPermanent("untapped Merfolk you control"); private static final FilterControlledPermanent filterNotTapped = new FilterControlledPermanent("untapped Merfolk you control");
private static final FilterControlledPermanent filterAll = new FilterControlledPermanent("Merfolk you control"); private static final FilterControlledPermanent filterAll = new FilterControlledPermanent("Merfolk you control");
static { static {
filterAnother.add(new AnotherPredicate()); filterAnotherNotTapped.add(new AnotherPredicate());
filterAnother.add(new SubtypePredicate(SubType.MERFOLK)); filterAnotherNotTapped.add(new SubtypePredicate(SubType.MERFOLK));
filterAnother.add(Predicates.not(new TappedPredicate())); filterAnotherNotTapped.add(Predicates.not(new TappedPredicate()));
filter.add(new SubtypePredicate(SubType.MERFOLK)); filterNotTapped.add(new SubtypePredicate(SubType.MERFOLK));
filter.add(Predicates.not(new TappedPredicate())); filterNotTapped.add(Predicates.not(new TappedPredicate()));
filterAll.add(new SubtypePredicate(SubType.MERFOLK)); filterAll.add(new SubtypePredicate(SubType.MERFOLK));
} }
@ -82,17 +82,17 @@ public class KumenaTyrantOfOrazca extends CardImpl {
// Tap another untapped Merfolk you control: Kumena, Tyrant of Orzca can't be blocked this turn. // Tap another untapped Merfolk you control: Kumena, Tyrant of Orzca can't be blocked this turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new CantBeBlockedSourceEffect(Duration.EndOfTurn), new CantBeBlockedSourceEffect(Duration.EndOfTurn),
new TapTargetCost(new TargetControlledPermanent(1, 1, filterAnother, true)))); new TapTargetCost(new TargetControlledPermanent(1, 1, filterAnotherNotTapped, true))));
// Tap three untapped Merfolk you control: Draw a card. // Tap three untapped Merfolk you control: Draw a card.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new DrawCardSourceControllerEffect(1), new DrawCardSourceControllerEffect(1),
new TapTargetCost(new TargetControlledPermanent(3, 3, filter, true)))); new TapTargetCost(new TargetControlledPermanent(3, 3, filterNotTapped, true))));
// Tap five untapped Merfolk you control: Put a +1/+1 counter on each Merfolk you control. // Tap five untapped Merfolk you control: Put a +1/+1 counter on each Merfolk you control.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new AddCountersAllEffect(CounterType.P1P1.createInstance(), filterAll), new AddCountersAllEffect(CounterType.P1P1.createInstance(), filterAll),
new TapTargetCost(new TargetControlledPermanent(5, 5, filterAll, true)))); new TapTargetCost(new TargetControlledPermanent(5, 5, filterNotTapped, true))));
} }