github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-26 11:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

small change to Partner with ability

Browse source
This commit is contained in:
Evan Kranzler 2018-05-21 15:53:06 -04:00
parent 1a3a0d88c0
commit 636b35ae39
6 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/Commander.java
View file

@ -33,7 +33,7 @@ import mage.abilities.Ability;
import mage.abilities.common.CanBeYourCommanderAbility; import mage.abilities.common.CanBeYourCommanderAbility;
import mage.abilities.costs.mana.ManaCost; import mage.abilities.costs.mana.ManaCost;
import mage.abilities.keyword.PartnerAbility; import mage.abilities.keyword.PartnerAbility;
import mage.abilities.keyword.PartnersWithAbility; import mage.abilities.keyword.PartnerWithAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.ExpansionSet; import mage.cards.ExpansionSet;
import mage.cards.Sets; import mage.cards.Sets;
@ -151,8 +151,8 @@ public class Commander extends Constructed {
if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) { if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) {
boolean partnersWith = false; boolean partnersWith = false;
for (Ability ability : commander.getAbilities()) { for (Ability ability : commander.getAbilities()) {
if (ability instanceof PartnersWithAbility if (ability instanceof PartnerWithAbility
&& commanderNames.contains(((PartnersWithAbility) ability).getPartnerName())) { && commanderNames.contains(((PartnerWithAbility) ability).getPartnerName())) {
partnersWith = true; partnersWith = true;
break; break;
} }

6
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/FreeformCommander.java
View file

@ -30,7 +30,7 @@ package mage.deck;
import java.util.*; import java.util.*;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.keyword.PartnerAbility; import mage.abilities.keyword.PartnerAbility;
import mage.abilities.keyword.PartnersWithAbility; import mage.abilities.keyword.PartnerWithAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.ExpansionSet; import mage.cards.ExpansionSet;
import mage.cards.Sets; import mage.cards.Sets;
@ -102,8 +102,8 @@ public class FreeformCommander extends Constructed {
if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) { if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) {
boolean partnersWith = false; boolean partnersWith = false;
for (Ability ability : commander.getAbilities()) { for (Ability ability : commander.getAbilities()) {
if (ability instanceof PartnersWithAbility if (ability instanceof PartnerWithAbility
&& commanderNames.contains(((PartnersWithAbility) ability).getPartnerName())) { && commanderNames.contains(((PartnerWithAbility) ability).getPartnerName())) {
partnersWith = true; partnersWith = true;
break; break;
} }

6
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/PennyDreadfulCommander.java
View file

@ -32,7 +32,7 @@ import java.util.Map.Entry;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.CanBeYourCommanderAbility; import mage.abilities.common.CanBeYourCommanderAbility;
import mage.abilities.keyword.PartnerAbility; import mage.abilities.keyword.PartnerAbility;
import mage.abilities.keyword.PartnersWithAbility; import mage.abilities.keyword.PartnerWithAbility;
import mage.cards.Card; import mage.cards.Card;
import mage.cards.ExpansionSet; import mage.cards.ExpansionSet;
import mage.cards.Sets; import mage.cards.Sets;
@ -113,8 +113,8 @@ public class PennyDreadfulCommander extends Constructed {
if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) { if (deck.getSideboard().size() == 2 && !commander.getAbilities().contains(PartnerAbility.getInstance())) {
boolean partnersWith = false; boolean partnersWith = false;
for (Ability ability : commander.getAbilities()) { for (Ability ability : commander.getAbilities()) {
if (ability instanceof PartnersWithAbility if (ability instanceof PartnerWithAbility
&& commanderNames.contains(((PartnersWithAbility) ability).getPartnerName())) { && commanderNames.contains(((PartnerWithAbility) ability).getPartnerName())) {
partnersWith = true; partnersWith = true;
break; break;
} }

4
Mage.Sets/src/mage/cards/p/PirImaginativeRascal.java
View file

@ -32,7 +32,7 @@ import mage.MageInt;
import mage.abilities.Ability; import mage.abilities.Ability;
import mage.abilities.common.SimpleStaticAbility; import mage.abilities.common.SimpleStaticAbility;
import mage.abilities.effects.ReplacementEffectImpl; import mage.abilities.effects.ReplacementEffectImpl;
import mage.abilities.keyword.PartnersWithAbility; import mage.abilities.keyword.PartnerWithAbility;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.SuperType; import mage.constants.SuperType;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -61,7 +61,7 @@ public class PirImaginativeRascal extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Partner with Toothy, Imaginary Friend (When this creature enters the battlefield, target player may put Toothy into their hand from their library, then shuffle.) // Partner with Toothy, Imaginary Friend (When this creature enters the battlefield, target player may put Toothy into their hand from their library, then shuffle.)
this.addAbility(new PartnersWithAbility("Toothy, Imaginary Friend")); this.addAbility(new PartnerWithAbility("Toothy, Imaginary Friend", true));
// If one or more counters would be put on a permanent your team controls, that many plus one of each of those kinds of counters are put on that permanent instead. // If one or more counters would be put on a permanent your team controls, that many plus one of each of those kinds of counters are put on that permanent instead.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PirImaginativeRascalEffect())); this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new PirImaginativeRascalEffect()));

4
Mage.Sets/src/mage/cards/t/ToothyImaginaryFriend.java
View file

@ -34,7 +34,7 @@ import mage.abilities.common.LeavesBattlefieldTriggeredAbility;
import mage.abilities.dynamicvalue.common.CountersSourceCount; import mage.abilities.dynamicvalue.common.CountersSourceCount;
import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.abilities.effects.common.counter.AddCountersSourceEffect; import mage.abilities.effects.common.counter.AddCountersSourceEffect;
import mage.abilities.keyword.PartnersWithAbility; import mage.abilities.keyword.PartnerWithAbility;
import mage.constants.SubType; import mage.constants.SubType;
import mage.constants.SuperType; import mage.constants.SuperType;
import mage.cards.CardImpl; import mage.cards.CardImpl;
@ -57,7 +57,7 @@ public class ToothyImaginaryFriend extends CardImpl {
this.toughness = new MageInt(1); this.toughness = new MageInt(1);
// Partner with Pir, Imaginative Rascal (When this creature enters the battlefield, target player may put Pir into their hand from their library, then shuffle.) // Partner with Pir, Imaginative Rascal (When this creature enters the battlefield, target player may put Pir into their hand from their library, then shuffle.)
this.addAbility(new PartnersWithAbility("Pir, Imaginative Rascal")); this.addAbility(new PartnerWithAbility("Pir, Imaginative Rascal", true));
// Whenever you draw a card, put a +1/+1 counter on Toothy, Imaginary Friend. // Whenever you draw a card, put a +1/+1 counter on Toothy, Imaginary Friend.
this.addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true)); this.addAbility(new DrawCardControllerTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true));

22
Mage/src/main/java/mage/abilities/keyword/PartnersWithAbility.java → Mage/src/main/java/mage/abilities/keyword/PartnerWithAbility.java
View file

@ -46,32 +46,40 @@ import mage.target.common.TargetCardInLibrary;
* *
* @author TheElk801 * @author TheElk801
*/ */
public class PartnersWithAbility extends EntersBattlefieldTriggeredAbility { public class PartnerWithAbility extends EntersBattlefieldTriggeredAbility {
private final String partnerName; private final String partnerName;
private final String shortName; private final String shortName;
public PartnersWithAbility(String partnerName) { public PartnerWithAbility(String partnerName) {
this(partnerName, false);
}
public PartnerWithAbility(String partnerName, boolean isLegendary) {
super(new PartnersWithSearchEffect(partnerName), false); super(new PartnersWithSearchEffect(partnerName), false);
this.addTarget(new TargetPlayer()); this.addTarget(new TargetPlayer());
this.partnerName = partnerName; this.partnerName = partnerName;
if (isLegendary) {
this.shortName = shortenName(partnerName); this.shortName = shortenName(partnerName);
} else {
this.shortName = partnerName;
}
} }
public PartnersWithAbility(final PartnersWithAbility ability) { public PartnerWithAbility(final PartnerWithAbility ability) {
super(ability); super(ability);
this.partnerName = ability.partnerName; this.partnerName = ability.partnerName;
this.shortName = ability.shortName; this.shortName = ability.shortName;
} }
@Override @Override
public PartnersWithAbility copy() { public PartnerWithAbility copy() {
return new PartnersWithAbility(this); return new PartnerWithAbility(this);
} }
@Override @Override
public String getRule() { public String getRule() {
return "Partners with" + partnerName return "Partner with " + partnerName
+ " <i>(When this creature enters the battlefield, target player may put " + shortName + " <i>(When this creature enters the battlefield, target player may put " + shortName
+ " into their hand from their library, then shuffle.)</i>"; + " into their hand from their library, then shuffle.)</i>";
} }
@ -122,7 +130,7 @@ class PartnersWithSearchEffect extends OneShotEffect {
FilterCard filter = new FilterCard("card named " + partnerName); FilterCard filter = new FilterCard("card named " + partnerName);
filter.add(new NamePredicate(partnerName)); filter.add(new NamePredicate(partnerName));
TargetCardInLibrary target = new TargetCardInLibrary(filter); TargetCardInLibrary target = new TargetCardInLibrary(filter);
if (player.chooseUse(Outcome.Benefit, "Search your library for a card named" + partnerName + " and put it into your hand?", source, game)) { if (player.chooseUse(Outcome.Benefit, "Search your library for a card named " + partnerName + " and put it into your hand?", source, game)) {
player.searchLibrary(target, game); player.searchLibrary(target, game);
for (UUID cardId : target.getTargets()) { for (UUID cardId : target.getTargets()) {
Card card = player.getLibrary().getCard(cardId, game); Card card = player.getLibrary().getCard(cardId, game);