External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[WHO] Implement The Thirteenth Doctor

Browse source
This commit is contained in:
theelk801 2023-08-05 13:44:40 -04:00
parent 9fede85c06
commit 8830fd0cc8
5 changed files with 108 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage.Server.Plugins/Mage.Deck.Constructed/src/mage/deck/AbstractCommander.java
View file

@ -27,7 +27,8 @@ public abstract class AbstractCommander extends Constructed {
PartnerValidator.instance,
FriendsForeverValidator.instance,
PartnerWithValidator.instance,
ChooseABackgroundValidator.instance
ChooseABackgroundValidator.instance,
DoctorsCompanionValidator.instance
);
protected final List<String> bannedCommander = new ArrayList<>();
protected final List<String> bannedPartner = new ArrayList<>();

69
Mage.Sets/src/mage/cards/t/TheThirteenthDoctor.java Normal file
View file

@ -0,0 +1,69 @@
package mage.cards.t;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
import mage.abilities.common.SpellCastControllerTriggeredAbility;
import mage.abilities.effects.common.UntapAllEffect;
import mage.abilities.effects.common.counter.AddCountersTargetEffect;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.*;
import mage.counters.CounterType;
import mage.filter.FilterPermanent;
import mage.filter.FilterSpell;
import mage.filter.common.FilterControlledCreaturePermanent;
import mage.filter.predicate.Predicates;
import mage.filter.predicate.card.CastFromZonePredicate;
import mage.filter.predicate.permanent.CounterAnyPredicate;
import mage.target.common.TargetCreaturePermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
public final class TheThirteenthDoctor extends CardImpl {
private static final FilterSpell filter
= new FilterSpell("a spell from anywhere other than your hand");
private static final FilterPermanent filter2
= new FilterControlledCreaturePermanent("creature you control with a counter on it");
static {
filter.add(Predicates.not(new CastFromZonePredicate(Zone.HAND)));
filter2.add(CounterAnyPredicate.instance);
}
public TheThirteenthDoctor(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{U}");
this.supertype.add(SuperType.LEGENDARY);
this.subtype.add(SubType.TIME_LORD);
this.subtype.add(SubType.DOCTOR);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
// Paradox -- Whenever you cast a spell from anywhere other than your hand, put a +1/+1 counter on target creature.
Ability ability = new SpellCastControllerTriggeredAbility(
new AddCountersTargetEffect(CounterType.P1P1.createInstance()), filter, false
);
ability.addTarget(new TargetCreaturePermanent());
this.addAbility(ability.withFlavorWord("Paradox"));
// Team TARDIS -- At the beginning of your end step, untap each creature you control with a counter on it.
this.addAbility(new BeginningOfEndStepTriggeredAbility(
new UntapAllEffect(filter2), TargetController.YOU, false
).withFlavorWord("Team TARDIS"));
}
private TheThirteenthDoctor(final TheThirteenthDoctor card) {
super(card);
}
@Override
public TheThirteenthDoctor copy() {
return new TheThirteenthDoctor(this);
}
}

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

@ -26,6 +26,7 @@ public final class DoctorWho extends ExpansionSet {
cards.add(new SetCardInfo("Plains", 197, Rarity.LAND, mage.cards.basiclands.Plains.class, NON_FULL_USE_VARIOUS));
cards.add(new SetCardInfo("Sarah Jane Smith", 6, Rarity.RARE, mage.cards.s.SarahJaneSmith.class));
cards.add(new SetCardInfo("Swamp", 201, Rarity.LAND, mage.cards.basiclands.Swamp.class, NON_FULL_USE_VARIOUS));
cards.add(new SetCardInfo("The Thirteenth Doctor", 4, Rarity.MYTHIC, mage.cards.t.TheThirteenthDoctor.class));
cards.add(new SetCardInfo("Yasmin Khan", 7, Rarity.RARE, mage.cards.y.YasminKhan.class));
}
}

2
Mage/src/main/java/mage/constants/SubType.java
View file

@ -138,6 +138,7 @@ public enum SubType {
DEVIL("Devil", SubTypeSet.CreatureType),
DINOSAUR("Dinosaur", SubTypeSet.CreatureType), // With Ixalan now being spoiled, need this to be selectable
DJINN("Djinn", SubTypeSet.CreatureType),
DOCTOR("Doctor", SubTypeSet.CreatureType),
DOG("Dog", SubTypeSet.CreatureType),
DRAGON("Dragon", SubTypeSet.CreatureType),
DRAKE("Drake", SubTypeSet.CreatureType),
@ -378,6 +379,7 @@ public enum SubType {
THALAKOS("Thalakos", SubTypeSet.CreatureType),
THOPTER("Thopter", SubTypeSet.CreatureType),
TIEFLING("Tiefling", SubTypeSet.CreatureType),
TIME_LORD("Time Lord", SubTypeSet.CreatureType),
TRANDOSHAN("Trandoshan", SubTypeSet.CreatureType, true), // Star Wars
THRULL("Thrull", SubTypeSet.CreatureType),
TREEFOLK("Treefolk", SubTypeSet.CreatureType),

34
Mage/src/main/java/mage/util/validation/DoctorsCompanionValidator.java Normal file
View file

@ -0,0 +1,34 @@
package mage.util.validation;
import mage.abilities.keyword.DoctorsCompanionAbility;
import mage.cards.Card;
import mage.constants.SubType;
/**
* @author TheElk801
* <p>
* We check for Brushwagg because it can't be a changeling
*/
public enum DoctorsCompanionValidator implements CommanderValidator {
instance;
@Override
public boolean checkPartner(Card commander1, Card commander2) {
return commander1.getAbilities().containsClass(DoctorsCompanionAbility.class)
&& commander2.hasSubTypeForDeckbuilding(SubType.TIME_LORD)
&& commander2.hasSubTypeForDeckbuilding(SubType.DOCTOR)
&& !commander2.hasSubTypeForDeckbuilding(SubType.BRUSHWAGG);
}
@Override
public boolean checkBothPartners(Card commander1, Card commander2) {
return checkPartner(commander1, commander2) || checkPartner(commander2, commander1);
}
@Override
public boolean specialCheck(Card commander) {
return commander.hasSubTypeForDeckbuilding(SubType.TIME_LORD)
&& commander.hasSubTypeForDeckbuilding(SubType.DOCTOR)
&& !commander.hasSubTypeForDeckbuilding(SubType.BRUSHWAGG);
}
}