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

Fixed merge conflicts

Browse source
This commit is contained in:
Christian 2017-08-14 16:13:35 -04:00
commit 214a585f8d
2 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Mage.Sets/src/mage/cards/k/KindredDominance.java
View file

@ -35,8 +35,7 @@ import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.DestroyAllEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.choices.Choice;
import mage.choices.ChoiceCreatureType;
import mage.abilities.effects.common.ChooseCreatureTypeEffect;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.SubType;
@ -57,6 +56,7 @@ public class KindredDominance extends CardImpl {
super(ownerId, setInfo, new CardType[]{CardType.SORCERY}, "{5}{B}{B}");
// Choose a creature type. Destroy all creatures that are not the chosen type.
this.getSpellAbility().addEffect(new ChooseCreatureTypeEffect(Outcome.DestroyPermanent));
this.getSpellAbility().addEffect(new KindredDominanceEffect());
}
@ -74,7 +74,7 @@ class KindredDominanceEffect extends OneShotEffect {
public KindredDominanceEffect() {
super(Outcome.DestroyPermanent);
this.staticText = "Choose a creature type. Destroy all creatures that are not the chosen type.";
this.staticText = " Destroy all creatures that are not the chosen type.";
}
public KindredDominanceEffect(final KindredDominanceEffect effect) {
@ -89,22 +89,11 @@ class KindredDominanceEffect extends OneShotEffect {
@Override
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
MageObject sourceObject = game.getObject(source.getSourceId());
if (controller != null) {
Choice typeChoice = new ChoiceCreatureType();
while (!controller.choose(outcome, typeChoice, game)) {
if (!controller.canRespond()) {
return false;
}
}
if (typeChoice.getChoice() != null) {
game.informPlayers(sourceObject.getLogName() + " chosen type: " + typeChoice.getChoice());
}
MageObject mageObject = game.getObject(source.getSourceId());
if (controller != null & mageObject != null) {
String creatureType = game.getState().getValue(mageObject.getId() + "_type").toString();
FilterPermanent filter = new FilterCreaturePermanent("creatures");
filter.add(Predicates.not(new SubtypePredicate(SubType.byDescription(typeChoice.getChoice()))));
filter.add(Predicates.not(new SubtypePredicate(SubType.byDescription(creatureType))));
return new DestroyAllEffect(filter).apply(game, source);
}
return false;

1
Mage.Sets/src/mage/sets/Commander2017.java
View file

@ -66,5 +66,6 @@ public class Commander2017 extends ExpansionSet {
cards.add(new SetCardInfo("Wasitora, Nekoru Queen", 49, Rarity.MYTHIC, mage.cards.w.WasitoraNekoruQueen.class));
cards.add(new SetCardInfo("Kindred Dominance", 18, Rarity.RARE, mage.cards.w.WasitoraNekoruQueen.class));
}
}