From cdf91e66fba10a6804622176fe58cfc85461bdbd Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sat, 8 Jun 2024 13:55:52 -0400 Subject: [PATCH] Change tribal card type to kindred, update viashino and naga (#12271) * change tribal card type to kindred * update viashino to lizard * update naga to snake --- .../main/java/mage/client/cards/DragCardGrid.java | 10 +++++----- Mage.Common/src/main/java/mage/view/CardView.java | 4 ++-- Mage.Sets/src/mage/cards/a/AllIsDust.java | 2 +- Mage.Sets/src/mage/cards/a/AltarOfTheGoyf.java | 2 +- Mage.Sets/src/mage/cards/a/AquitectsWill.java | 2 +- Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java | 2 +- Mage.Sets/src/mage/cards/b/Bitterblossom.java | 2 +- Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java | 2 +- Mage.Sets/src/mage/cards/b/BloodOath.java | 6 +++--- Mage.Sets/src/mage/cards/b/BloodscaleProwler.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartBirthRite.java | 2 +- Mage.Sets/src/mage/cards/b/BoggartShenanigans.java | 2 +- Mage.Sets/src/mage/cards/b/BoundInSilence.java | 2 +- .../src/mage/cards/b/BurningTreeBloodscale.java | 2 +- Mage.Sets/src/mage/cards/c/CarrionThrash.java | 3 +-- Mage.Sets/src/mage/cards/c/ChampionOfWits.java | 2 +- Mage.Sets/src/mage/cards/c/CloakAndDagger.java | 2 +- Mage.Sets/src/mage/cards/c/ConsumingBonfire.java | 2 +- Mage.Sets/src/mage/cards/c/CorneredCrook.java | 2 +- Mage.Sets/src/mage/cards/c/CribSwap.java | 2 +- Mage.Sets/src/mage/cards/c/CrushUnderfoot.java | 2 +- Mage.Sets/src/mage/cards/d/DaggerCaster.java | 2 +- Mage.Sets/src/mage/cards/d/DesiccatedNaga.java | 2 +- Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java | 2 +- Mage.Sets/src/mage/cards/d/DivinersWand.java | 2 +- Mage.Sets/src/mage/cards/d/DuneDiviner.java | 2 +- Mage.Sets/src/mage/cards/e/EchoesOfEternity.java | 2 +- Mage.Sets/src/mage/cards/e/EgoErasure.java | 2 +- Mage.Sets/src/mage/cards/e/EldraziConscription.java | 2 +- Mage.Sets/src/mage/cards/e/EldritchImmunity.java | 2 +- Mage.Sets/src/mage/cards/e/ElvishPromenade.java | 2 +- Mage.Sets/src/mage/cards/e/EyeblightsEnding.java | 2 +- Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieTauntings.java | 2 +- Mage.Sets/src/mage/cards/f/FaerieTrickery.java | 2 +- Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java | 2 +- Mage.Sets/src/mage/cards/f/FertileImagination.java | 6 +++--- Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java | 2 +- Mage.Sets/src/mage/cards/f/FodderLaunch.java | 4 +--- Mage.Sets/src/mage/cards/g/GarrisonSergeant.java | 2 +- Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java | 2 +- Mage.Sets/src/mage/cards/g/GiantsIre.java | 2 +- Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java | 2 +- Mage.Sets/src/mage/cards/g/GloryscaleViashino.java | 2 +- Mage.Sets/src/mage/cards/g/GuardianNaga.java | 2 +- Mage.Sets/src/mage/cards/g/GurmagDrowner.java | 2 +- Mage.Sets/src/mage/cards/h/HarrierNaga.java | 2 +- Mage.Sets/src/mage/cards/h/HivisOfTheScale.java | 2 +- Mage.Sets/src/mage/cards/h/HoodedBrawler.java | 2 +- Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java | 2 +- Mage.Sets/src/mage/cards/h/HuntingTriad.java | 2 +- Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java | 2 +- .../src/mage/cards/i/IkraShidiqiTheUsurper.java | 2 +- Mage.Sets/src/mage/cards/i/ImmolationShaman.java | 2 +- .../src/mage/cards/i/ImotiCelebrantOfBounty.java | 2 +- Mage.Sets/src/mage/cards/j/JundSojourners.java | 2 +- .../src/mage/cards/k/KadenaSlinkingSorcerer.java | 2 +- Mage.Sets/src/mage/cards/k/KadenasSilencer.java | 2 +- Mage.Sets/src/mage/cards/k/KarsusDepthguard.java | 2 +- Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java | 2 +- .../src/mage/cards/k/KnowledgeExploitation.java | 2 +- Mage.Sets/src/mage/cards/k/KozileksCommand.java | 2 +- .../src/mage/cards/k/KyloxVisionaryInventor.java | 2 +- Mage.Sets/src/mage/cards/l/Lignify.java | 2 +- Mage.Sets/src/mage/cards/m/MerrowCommerce.java | 2 +- Mage.Sets/src/mage/cards/m/MezzioMugger.java | 2 +- Mage.Sets/src/mage/cards/m/MilitiasPride.java | 2 +- Mage.Sets/src/mage/cards/m/MindclawShaman.java | 2 +- Mage.Sets/src/mage/cards/m/MirrorGolem.java | 4 ++-- Mage.Sets/src/mage/cards/m/MistSyndicateNaga.java | 3 +-- Mage.Sets/src/mage/cards/m/MorselTheft.java | 2 +- Mage.Sets/src/mage/cards/n/NagaEternal.java | 2 +- Mage.Sets/src/mage/cards/n/NagaOracle.java | 2 +- Mage.Sets/src/mage/cards/n/NagaVitalist.java | 2 +- Mage.Sets/src/mage/cards/n/NamelessInversion.java | 2 +- Mage.Sets/src/mage/cards/n/NogginWhack.java | 2 +- Mage.Sets/src/mage/cards/n/NotOfThisWorld.java | 2 +- Mage.Sets/src/mage/cards/n/NotoriousThrong.java | 2 +- Mage.Sets/src/mage/cards/o/OasisRitualist.java | 2 +- Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java | 2 +- Mage.Sets/src/mage/cards/o/OgnisTheDragonsLash.java | 2 +- .../src/mage/cards/o/OmarthisGhostfireInitiate.java | 2 +- Mage.Sets/src/mage/cards/p/Peppersmoke.java | 2 +- Mage.Sets/src/mage/cards/p/PlasmaJockey.java | 2 +- Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java | 2 +- Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java | 2 +- Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java | 2 +- Mage.Sets/src/mage/cards/p/PyrotechnicPerformer.java | 2 +- Mage.Sets/src/mage/cards/q/QarsiDeceiver.java | 2 +- Mage.Sets/src/mage/cards/r/RalsStaticaster.java | 2 +- Mage.Sets/src/mage/cards/r/RamunapExcavator.java | 2 +- Mage.Sets/src/mage/cards/r/ReachOfBranches.java | 2 +- .../src/mage/cards/r/RebellionOfTheFlamekin.java | 2 +- Mage.Sets/src/mage/cards/r/Retromancer.java | 2 +- Mage.Sets/src/mage/cards/r/RivazOfTheClaw.java | 2 +- Mage.Sets/src/mage/cards/r/RiveteersInitiate.java | 2 +- .../src/mage/cards/r/RiveteersRequisitioner.java | 2 +- Mage.Sets/src/mage/cards/r/Rootgrapple.java | 2 +- Mage.Sets/src/mage/cards/r/RubblebeltBraggart.java | 2 +- Mage.Sets/src/mage/cards/r/RubblebeltRunner.java | 2 +- Mage.Sets/src/mage/cards/s/SagesDousing.java | 2 +- Mage.Sets/src/mage/cards/s/SaguArcher.java | 2 +- .../src/mage/cards/s/SeerOfTheLastTomorrow.java | 2 +- Mage.Sets/src/mage/cards/s/ShieldsOfVelisVel.java | 2 +- Mage.Sets/src/mage/cards/s/ShivanSandMage.java | 2 +- Mage.Sets/src/mage/cards/s/SidewinderNaga.java | 2 +- Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java | 2 +- Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java | 2 +- Mage.Sets/src/mage/cards/s/SidisisFaithful.java | 2 +- Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java | 2 +- Mage.Sets/src/mage/cards/s/SinuousStriker.java | 2 +- Mage.Sets/src/mage/cards/s/SkitteringInvasion.java | 2 +- Mage.Sets/src/mage/cards/s/SkyclawThrash.java | 2 +- Mage.Sets/src/mage/cards/s/SlitherBlade.java | 2 +- Mage.Sets/src/mage/cards/s/SpellweaverEternal.java | 2 +- Mage.Sets/src/mage/cards/s/StormscaleAnarch.java | 2 +- .../src/mage/cards/s/StreamOfUnconsciousness.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiFlayer.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiSkullkeeper.java | 2 +- Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java | 2 +- Mage.Sets/src/mage/cards/s/SummonTheSchool.java | 2 +- Mage.Sets/src/mage/cards/s/SurgeOfThoughtweft.java | 2 +- Mage.Sets/src/mage/cards/t/TahCropSkirmisher.java | 2 +- Mage.Sets/src/mage/cards/t/Tarfire.java | 2 +- Mage.Sets/src/mage/cards/t/TarmogoyfNest.java | 2 +- Mage.Sets/src/mage/cards/t/ThievesFortune.java | 2 +- Mage.Sets/src/mage/cards/t/ThornThrashViashino.java | 2 +- Mage.Sets/src/mage/cards/t/ThornbiteStaff.java | 2 +- Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java | 2 +- Mage.Sets/src/mage/cards/t/ThunderThrashElder.java | 2 +- Mage.Sets/src/mage/cards/t/TinStreetGossip.java | 2 +- Mage.Sets/src/mage/cards/v/VeteransArmaments.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoBey.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoBladescout.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoBranchrider.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoFangtail.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoFirstblade.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoGrappler.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoHeretic.java | 3 +-- Mage.Sets/src/mage/cards/v/ViashinoLashclaw.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoOutrider.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoPyromancer.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoRacketeer.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoRunner.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSandscout.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoShanktail.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSlasher.java | 2 +- .../src/mage/cards/v/ViashinoSlaughtermaster.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoSpearhunter.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoWarrior.java | 2 +- Mage.Sets/src/mage/cards/v/ViashinoWeaponsmith.java | 2 +- Mage.Sets/src/mage/cards/v/VigeanIntuition.java | 6 +++--- Mage.Sets/src/mage/cards/v/VioletPall.java | 2 +- Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java | 2 +- Mage.Sets/src/mage/cards/w/WarrenWeirding.java | 2 +- Mage.Sets/src/mage/cards/w/WatchfulNaga.java | 2 +- Mage.Sets/src/mage/cards/w/WeaverOfCurrents.java | 2 +- Mage.Sets/src/mage/cards/w/WeepingAngel.java | 2 +- Mage.Sets/src/mage/cards/w/WingsOfVelisVel.java | 2 +- Mage.Sets/src/mage/cards/w/WorldQueller.java | 6 +++--- Mage.Sets/src/mage/cards/y/YurlokOfScorchThrash.java | 2 +- Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java | 2 +- Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java | 2 +- .../mage/test/cards/copy/PhantasmalImageTest.java | 6 +++--- .../test/cards/single/thb/OneWithTheStarsTest.java | 2 +- .../test/java/mage/verify/VerifyCardDataTest.java | 7 +------ Mage/src/main/java/mage/MageObject.java | 12 ++++++------ Mage/src/main/java/mage/MageObjectImpl.java | 4 ++-- .../continuous/LoseCreatureTypeSourceEffect.java | 2 +- Mage/src/main/java/mage/constants/CardType.java | 2 +- Mage/src/main/java/mage/constants/SubType.java | 6 ++---- Utils/gen-card.pl | 3 +-- 177 files changed, 200 insertions(+), 213 deletions(-) diff --git a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java index c65df33bbf9..34dd8582b5a 100644 --- a/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java +++ b/Mage.Client/src/main/java/mage/client/cards/DragCardGrid.java @@ -533,10 +533,10 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg return card.isBattle(); } }; - private final CardTypeCounter tribalCounter = new CardTypeCounter() { + private final CardTypeCounter kindredCounter = new CardTypeCounter() { @Override protected boolean is(CardView card) { - return card.isTribal(); + return card.isKindred(); } }; @@ -549,7 +549,7 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg planeswalkerCounter, sorceryCounter, battleCounter, - tribalCounter + kindredCounter }; // Listener @@ -1914,8 +1914,8 @@ public class DragCardGrid extends JPanel implements DragCardSource, DragCardTarg return planeswalkerCounter.get(); case SORCERY: return sorceryCounter.get(); - case TRIBAL: - return tribalCounter.get(); + case KINDRED: + return kindredCounter.get(); default: break; } diff --git a/Mage.Common/src/main/java/mage/view/CardView.java b/Mage.Common/src/main/java/mage/view/CardView.java index da5d40fd481..d4ba85ce637 100644 --- a/Mage.Common/src/main/java/mage/view/CardView.java +++ b/Mage.Common/src/main/java/mage/view/CardView.java @@ -1573,8 +1573,8 @@ public class CardView extends SimpleCardView { return cardTypes.contains(CardType.ARTIFACT); } - public boolean isTribal() { - return cardTypes.contains(CardType.TRIBAL); + public boolean isKindred() { + return cardTypes.contains(CardType.KINDRED); } public void setInViewerOnly(boolean inViewerOnly) { diff --git a/Mage.Sets/src/mage/cards/a/AllIsDust.java b/Mage.Sets/src/mage/cards/a/AllIsDust.java index 49b9adfe584..3ac471ab5b0 100644 --- a/Mage.Sets/src/mage/cards/a/AllIsDust.java +++ b/Mage.Sets/src/mage/cards/a/AllIsDust.java @@ -19,7 +19,7 @@ import mage.game.permanent.Permanent; public final class AllIsDust extends CardImpl { public AllIsDust(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{7}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.SORCERY},"{7}"); this.subtype.add(SubType.ELDRAZI); this.getSpellAbility().addEffect(new AllIsDustEffect()); } diff --git a/Mage.Sets/src/mage/cards/a/AltarOfTheGoyf.java b/Mage.Sets/src/mage/cards/a/AltarOfTheGoyf.java index 5da95e8ec1c..7ad18f44840 100644 --- a/Mage.Sets/src/mage/cards/a/AltarOfTheGoyf.java +++ b/Mage.Sets/src/mage/cards/a/AltarOfTheGoyf.java @@ -26,7 +26,7 @@ public final class AltarOfTheGoyf extends CardImpl { = new FilterCreaturePermanent(SubType.LHURGOYF, "Lhurgoyf creatures"); public AltarOfTheGoyf(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ARTIFACT}, "{5}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ARTIFACT}, "{5}"); this.subtype.add(SubType.LHURGOYF); diff --git a/Mage.Sets/src/mage/cards/a/AquitectsWill.java b/Mage.Sets/src/mage/cards/a/AquitectsWill.java index ebe43b05299..e7e96b903be 100644 --- a/Mage.Sets/src/mage/cards/a/AquitectsWill.java +++ b/Mage.Sets/src/mage/cards/a/AquitectsWill.java @@ -27,7 +27,7 @@ public final class AquitectsWill extends CardImpl { private static final Condition condition = new PermanentsOnTheBattlefieldCondition(filter); public AquitectsWill(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{U}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{U}"); this.subtype.add(SubType.MERFOLK); // Put a flood counter on target land. diff --git a/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java b/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java index 9cc9c8cf83b..23b160ee1bd 100644 --- a/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java +++ b/Mage.Sets/src/mage/cards/a/ArchersOfQarsi.java @@ -18,7 +18,7 @@ public final class ArchersOfQarsi extends CardImpl { public ArchersOfQarsi(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.ARCHER); this.power = new MageInt(5); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/b/Bitterblossom.java b/Mage.Sets/src/mage/cards/b/Bitterblossom.java index fc09f2e01af..e82003aea80 100644 --- a/Mage.Sets/src/mage/cards/b/Bitterblossom.java +++ b/Mage.Sets/src/mage/cards/b/Bitterblossom.java @@ -20,7 +20,7 @@ import mage.game.permanent.token.FaerieRogueToken; public final class Bitterblossom extends CardImpl { public Bitterblossom(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ENCHANTMENT},"{1}{B}"); this.subtype.add(SubType.FAERIE); // At the beginning of your upkeep, you lose 1 life and create a 1/1 black Faerie Rogue creature token with flying. diff --git a/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java b/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java index 0db2ae01f81..319df4a2fc2 100644 --- a/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java +++ b/Mage.Sets/src/mage/cards/b/BladesOfVelisVel.java @@ -18,7 +18,7 @@ import java.util.UUID; public final class BladesOfVelisVel extends CardImpl { public BladesOfVelisVel(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{1}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{1}{R}"); this.subtype.add(SubType.SHAPESHIFTER); // Changeling diff --git a/Mage.Sets/src/mage/cards/b/BloodOath.java b/Mage.Sets/src/mage/cards/b/BloodOath.java index da77f815464..fc945491840 100644 --- a/Mage.Sets/src/mage/cards/b/BloodOath.java +++ b/Mage.Sets/src/mage/cards/b/BloodOath.java @@ -54,7 +54,7 @@ class BloodOathEffect extends OneShotEffect { choice.add(CardType.LAND.toString()); choice.add(CardType.PLANESWALKER.toString()); choice.add(CardType.SORCERY.toString()); - choice.add(CardType.TRIBAL.toString()); + choice.add(CardType.KINDRED.toString()); } public BloodOathEffect() { @@ -97,8 +97,8 @@ class BloodOathEffect extends OneShotEffect { type = CardType.SORCERY; } else if (chosenType.equals(CardType.PLANESWALKER.toString())) { type = CardType.PLANESWALKER; - } else if (chosenType.equals(CardType.TRIBAL.toString())) { - type = CardType.TRIBAL; + } else if (chosenType.equals(CardType.KINDRED.toString())) { + type = CardType.KINDRED; } if (type != null) { Cards hand = opponent.getHand(); diff --git a/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java b/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java index 00248550142..6866d3c78d3 100644 --- a/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java +++ b/Mage.Sets/src/mage/cards/b/BloodscaleProwler.java @@ -17,7 +17,7 @@ public final class BloodscaleProwler extends CardImpl { public BloodscaleProwler(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.VIASHINO, SubType.WARRIOR); + this.subtype.add(SubType.LIZARD, SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java b/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java index a4dfc023ee1..5797de8730b 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java +++ b/Mage.Sets/src/mage/cards/b/BoggartBirthRite.java @@ -22,7 +22,7 @@ public final class BoggartBirthRite extends CardImpl { } public BoggartBirthRite(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{B}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{B}"); this.subtype.add(SubType.GOBLIN); this.getSpellAbility().addEffect(new ReturnFromGraveyardToHandTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java index 2fd43ed5877..e38e3a869a0 100644 --- a/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java +++ b/Mage.Sets/src/mage/cards/b/BoggartShenanigans.java @@ -26,7 +26,7 @@ public final class BoggartShenanigans extends CardImpl { } public BoggartShenanigans(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{2}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{2}{R}"); this.subtype.add(SubType.GOBLIN); // Whenever another Goblin you control dies, you may have Boggart Shenanigans deal 1 damage to target player. diff --git a/Mage.Sets/src/mage/cards/b/BoundInSilence.java b/Mage.Sets/src/mage/cards/b/BoundInSilence.java index 782710962aa..edb7ec78b05 100644 --- a/Mage.Sets/src/mage/cards/b/BoundInSilence.java +++ b/Mage.Sets/src/mage/cards/b/BoundInSilence.java @@ -20,7 +20,7 @@ import mage.target.common.TargetCreaturePermanent; public final class BoundInSilence extends CardImpl { public BoundInSilence(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{2}{W}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ENCHANTMENT},"{2}{W}"); this.subtype.add(SubType.REBEL, SubType.AURA); diff --git a/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java b/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java index c6fe63604cc..4fff8e299e9 100644 --- a/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java +++ b/Mage.Sets/src/mage/cards/b/BurningTreeBloodscale.java @@ -25,7 +25,7 @@ public final class BurningTreeBloodscale extends CardImpl { public BurningTreeBloodscale(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{G}"); - this.subtype.add(SubType.VIASHINO, SubType.BERSERKER); + this.subtype.add(SubType.LIZARD, SubType.BERSERKER); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CarrionThrash.java b/Mage.Sets/src/mage/cards/c/CarrionThrash.java index b030aabaced..8fab72c58fe 100644 --- a/Mage.Sets/src/mage/cards/c/CarrionThrash.java +++ b/Mage.Sets/src/mage/cards/c/CarrionThrash.java @@ -5,7 +5,6 @@ import mage.abilities.common.DiesSourceTriggeredAbility; import mage.abilities.costs.mana.GenericManaCost; import mage.abilities.effects.common.DoIfCostPaid; import mage.abilities.effects.common.ReturnFromGraveyardToHandTargetEffect; -import mage.abilities.effects.common.ReturnToHandTargetEffect; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; @@ -29,7 +28,7 @@ public final class CarrionThrash extends CardImpl { public CarrionThrash(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{R}{G}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfWits.java b/Mage.Sets/src/mage/cards/c/ChampionOfWits.java index c6ea120461e..f32e7a86279 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfWits.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfWits.java @@ -26,7 +26,7 @@ public final class ChampionOfWits extends CardImpl { public ChampionOfWits(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java index 2b30e60cfc7..9ceae6f6e75 100644 --- a/Mage.Sets/src/mage/cards/c/CloakAndDagger.java +++ b/Mage.Sets/src/mage/cards/c/CloakAndDagger.java @@ -26,7 +26,7 @@ public final class CloakAndDagger extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent(SubType.ROGUE, "a Rogue creature"); public CloakAndDagger(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ARTIFACT}, "{2}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ARTIFACT}, "{2}"); this.subtype.add(SubType.ROGUE); this.subtype.add(SubType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java index 30ce0c08c92..16a5b689d5a 100644 --- a/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java +++ b/Mage.Sets/src/mage/cards/c/ConsumingBonfire.java @@ -30,7 +30,7 @@ public final class ConsumingBonfire extends CardImpl { } public ConsumingBonfire(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{3}{R}{R}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.SORCERY},"{3}{R}{R}"); this.subtype.add(SubType.ELEMENTAL); // Choose one - Consuming Bonfire deals 4 damage to target non-Elemental creature; diff --git a/Mage.Sets/src/mage/cards/c/CorneredCrook.java b/Mage.Sets/src/mage/cards/c/CorneredCrook.java index 2a3a18b3d00..a5223cf2ab0 100644 --- a/Mage.Sets/src/mage/cards/c/CorneredCrook.java +++ b/Mage.Sets/src/mage/cards/c/CorneredCrook.java @@ -23,7 +23,7 @@ public final class CorneredCrook extends CardImpl { public CorneredCrook(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/CribSwap.java b/Mage.Sets/src/mage/cards/c/CribSwap.java index cb605543bd7..6de9284cf01 100644 --- a/Mage.Sets/src/mage/cards/c/CribSwap.java +++ b/Mage.Sets/src/mage/cards/c/CribSwap.java @@ -19,7 +19,7 @@ import java.util.UUID; public final class CribSwap extends CardImpl { public CribSwap(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{2}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{2}{W}"); this.subtype.add(SubType.SHAPESHIFTER); // Changeling diff --git a/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java b/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java index 37462e97d9b..1df8a71620c 100644 --- a/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java +++ b/Mage.Sets/src/mage/cards/c/CrushUnderfoot.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; public final class CrushUnderfoot extends CardImpl { public CrushUnderfoot(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{1}{R}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{1}{R}"); this.subtype.add(SubType.GIANT); diff --git a/Mage.Sets/src/mage/cards/d/DaggerCaster.java b/Mage.Sets/src/mage/cards/d/DaggerCaster.java index b505371fee8..aed8e187569 100644 --- a/Mage.Sets/src/mage/cards/d/DaggerCaster.java +++ b/Mage.Sets/src/mage/cards/d/DaggerCaster.java @@ -22,7 +22,7 @@ public final class DaggerCaster extends CardImpl { public DaggerCaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ROGUE); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java b/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java index 6584ac0e78c..a429b6637d3 100644 --- a/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java +++ b/Mage.Sets/src/mage/cards/d/DesiccatedNaga.java @@ -32,7 +32,7 @@ public final class DesiccatedNaga extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java b/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java index 6df53cc15ae..b4d407d587f 100644 --- a/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java +++ b/Mage.Sets/src/mage/cards/d/DevoteeOfStrength.java @@ -23,7 +23,7 @@ public final class DevoteeOfStrength extends CardImpl { public DevoteeOfStrength(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/d/DivinersWand.java b/Mage.Sets/src/mage/cards/d/DivinersWand.java index 4be82f95d10..d31f9ac204a 100644 --- a/Mage.Sets/src/mage/cards/d/DivinersWand.java +++ b/Mage.Sets/src/mage/cards/d/DivinersWand.java @@ -30,7 +30,7 @@ public final class DivinersWand extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent(SubType.WIZARD, "a Wizard creature"); public DivinersWand(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ARTIFACT}, "{3}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ARTIFACT}, "{3}"); this.subtype.add(SubType.WIZARD); this.subtype.add(SubType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/d/DuneDiviner.java b/Mage.Sets/src/mage/cards/d/DuneDiviner.java index 63457736700..5619f358b36 100644 --- a/Mage.Sets/src/mage/cards/d/DuneDiviner.java +++ b/Mage.Sets/src/mage/cards/d/DuneDiviner.java @@ -33,7 +33,7 @@ public final class DuneDiviner extends CardImpl { public DuneDiviner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/e/EchoesOfEternity.java b/Mage.Sets/src/mage/cards/e/EchoesOfEternity.java index d3e9226e3b5..7bb66fb6f2e 100644 --- a/Mage.Sets/src/mage/cards/e/EchoesOfEternity.java +++ b/Mage.Sets/src/mage/cards/e/EchoesOfEternity.java @@ -31,7 +31,7 @@ public final class EchoesOfEternity extends CardImpl { } public EchoesOfEternity(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{3}{C}{C}{C}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{3}{C}{C}{C}"); this.subtype.add(SubType.ELDRAZI); diff --git a/Mage.Sets/src/mage/cards/e/EgoErasure.java b/Mage.Sets/src/mage/cards/e/EgoErasure.java index 6bc3035001c..21c03951b0d 100644 --- a/Mage.Sets/src/mage/cards/e/EgoErasure.java +++ b/Mage.Sets/src/mage/cards/e/EgoErasure.java @@ -21,7 +21,7 @@ import java.util.UUID; public final class EgoErasure extends CardImpl { public EgoErasure(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{2}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{2}{U}"); this.subtype.add(SubType.SHAPESHIFTER); // Changeling diff --git a/Mage.Sets/src/mage/cards/e/EldraziConscription.java b/Mage.Sets/src/mage/cards/e/EldraziConscription.java index 224cdbd9d7a..3f399afb241 100644 --- a/Mage.Sets/src/mage/cards/e/EldraziConscription.java +++ b/Mage.Sets/src/mage/cards/e/EldraziConscription.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; public final class EldraziConscription extends CardImpl { public EldraziConscription (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{8}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ENCHANTMENT},"{8}"); this.subtype.add(SubType.ELDRAZI); this.subtype.add(SubType.AURA); diff --git a/Mage.Sets/src/mage/cards/e/EldritchImmunity.java b/Mage.Sets/src/mage/cards/e/EldritchImmunity.java index f1e51af5695..156ea2248db 100644 --- a/Mage.Sets/src/mage/cards/e/EldritchImmunity.java +++ b/Mage.Sets/src/mage/cards/e/EldritchImmunity.java @@ -30,7 +30,7 @@ public final class EldritchImmunity extends CardImpl { } public EldritchImmunity(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{C}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{C}"); this.subtype.add(SubType.ELDRAZI); diff --git a/Mage.Sets/src/mage/cards/e/ElvishPromenade.java b/Mage.Sets/src/mage/cards/e/ElvishPromenade.java index 9770d198d05..d362df6203d 100644 --- a/Mage.Sets/src/mage/cards/e/ElvishPromenade.java +++ b/Mage.Sets/src/mage/cards/e/ElvishPromenade.java @@ -27,7 +27,7 @@ public final class ElvishPromenade extends CardImpl { private static final DynamicValue elfCount = new PermanentsOnBattlefieldCount(filter); public ElvishPromenade(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{3}{G}"); this.subtype.add(SubType.ELF); this.getSpellAbility().addHint(new ValueHint("Elves you control", elfCount)); diff --git a/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java b/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java index 26f9c2e4632..ce39d520ebe 100644 --- a/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java +++ b/Mage.Sets/src/mage/cards/e/EyeblightsEnding.java @@ -24,7 +24,7 @@ public final class EyeblightsEnding extends CardImpl { } public EyeblightsEnding(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{2}{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{2}{B}"); this.subtype.add(SubType.ELF); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java b/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java index 789fdb056f4..5da9e6b315e 100644 --- a/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java +++ b/Mage.Sets/src/mage/cards/e/EyesOfTheWisent.java @@ -28,7 +28,7 @@ public final class EyesOfTheWisent extends CardImpl { } public EyesOfTheWisent(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{1}{G}"); this.subtype.add(SubType.ELEMENTAL); // Whenever an opponent casts a blue spell during your turn, you may create a 4/4 green Elemental creature token. diff --git a/Mage.Sets/src/mage/cards/f/FaerieTauntings.java b/Mage.Sets/src/mage/cards/f/FaerieTauntings.java index b07fde5a8d1..1b3579b8ee3 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieTauntings.java +++ b/Mage.Sets/src/mage/cards/f/FaerieTauntings.java @@ -19,7 +19,7 @@ import java.util.UUID; public final class FaerieTauntings extends CardImpl { public FaerieTauntings(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{2}{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ENCHANTMENT},"{2}{B}"); this.subtype.add(SubType.FAERIE); // Whenever you cast a spell during an opponent's turn, you may have each opponent lose 1 life diff --git a/Mage.Sets/src/mage/cards/f/FaerieTrickery.java b/Mage.Sets/src/mage/cards/f/FaerieTrickery.java index 102b43e67a9..7276e1372bb 100644 --- a/Mage.Sets/src/mage/cards/f/FaerieTrickery.java +++ b/Mage.Sets/src/mage/cards/f/FaerieTrickery.java @@ -24,7 +24,7 @@ public final class FaerieTrickery extends CardImpl { } public FaerieTrickery(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{1}{U}{U}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{1}{U}{U}"); this.subtype.add(SubType.FAERIE); diff --git a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java index 6e44ba127b2..943d8077196 100644 --- a/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java +++ b/Mage.Sets/src/mage/cards/f/FavorOfTheMighty.java @@ -27,7 +27,7 @@ import mage.game.permanent.Permanent; public final class FavorOfTheMighty extends CardImpl { public FavorOfTheMighty(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{1}{W}"); this.subtype.add(SubType.GIANT); // Each creature with the highest converted mana cost has protection from all colors. diff --git a/Mage.Sets/src/mage/cards/f/FertileImagination.java b/Mage.Sets/src/mage/cards/f/FertileImagination.java index 791b4a743de..e04a467df5b 100644 --- a/Mage.Sets/src/mage/cards/f/FertileImagination.java +++ b/Mage.Sets/src/mage/cards/f/FertileImagination.java @@ -57,7 +57,7 @@ class FertileImaginationEffect extends OneShotEffect { choice.add(CardType.LAND.toString()); choice.add(CardType.PLANESWALKER.toString()); choice.add(CardType.SORCERY.toString()); - choice.add(CardType.TRIBAL.toString()); + choice.add(CardType.KINDRED.toString()); } public FertileImaginationEffect() { @@ -100,8 +100,8 @@ class FertileImaginationEffect extends OneShotEffect { type = CardType.SORCERY; } else if (chosenType.equals(CardType.PLANESWALKER.toString())) { type = CardType.PLANESWALKER; - } else if (chosenType.equals(CardType.TRIBAL.toString())) { - type = CardType.TRIBAL; + } else if (chosenType.equals(CardType.KINDRED.toString())) { + type = CardType.KINDRED; } if (type != null) { Cards hand = opponent.getHand(); diff --git a/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java b/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java index 05654b4ee20..0aaec19db8b 100644 --- a/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java +++ b/Mage.Sets/src/mage/cards/f/FeudkillersVerdict.java @@ -21,7 +21,7 @@ import mage.players.Player; public final class FeudkillersVerdict extends CardImpl { public FeudkillersVerdict(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{4}{W}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{4}{W}{W}"); this.subtype.add(SubType.GIANT); // You gain 10 life. Then if you have more life than an opponent, create a 5/5 white Giant Warrior creature token. diff --git a/Mage.Sets/src/mage/cards/f/FodderLaunch.java b/Mage.Sets/src/mage/cards/f/FodderLaunch.java index acc11a30d8b..2e5ab099075 100644 --- a/Mage.Sets/src/mage/cards/f/FodderLaunch.java +++ b/Mage.Sets/src/mage/cards/f/FodderLaunch.java @@ -11,8 +11,6 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.SubType; import mage.filter.FilterPermanent; -import mage.filter.common.FilterControlledCreaturePermanent; -import mage.target.common.TargetControlledCreaturePermanent; import mage.target.common.TargetCreaturePermanent; /** @@ -23,7 +21,7 @@ public final class FodderLaunch extends CardImpl { private static final FilterPermanent filter = new FilterPermanent(SubType.GOBLIN, "a Goblin"); public FodderLaunch(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{3}{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.SORCERY},"{3}{B}"); this.subtype.add(SubType.GOBLIN); //As an additional cost to cast Fodder Launch, sacrifice a Goblin. diff --git a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java index 331d90aa750..92d607bbc85 100644 --- a/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java +++ b/Mage.Sets/src/mage/cards/g/GarrisonSergeant.java @@ -31,7 +31,7 @@ public final class GarrisonSergeant extends CardImpl { public GarrisonSergeant(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{W}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java b/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java index f641cef6e81..eff55377b4c 100644 --- a/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java +++ b/Mage.Sets/src/mage/cards/g/GhorClanBloodscale.java @@ -22,7 +22,7 @@ public final class GhorClanBloodscale extends CardImpl { public GhorClanBloodscale(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GiantsIre.java b/Mage.Sets/src/mage/cards/g/GiantsIre.java index df0ecce9ba9..8e9210eb5c6 100644 --- a/Mage.Sets/src/mage/cards/g/GiantsIre.java +++ b/Mage.Sets/src/mage/cards/g/GiantsIre.java @@ -26,7 +26,7 @@ public final class GiantsIre extends CardImpl { } public GiantsIre(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{3}{R}"); this.subtype.add(SubType.GIANT); // Giant's Ire deals 4 damage to target player. diff --git a/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java b/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java index 2c85641070e..172fece32bc 100644 --- a/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java +++ b/Mage.Sets/src/mage/cards/g/GiltLeafAmbush.java @@ -27,7 +27,7 @@ import java.util.UUID; public final class GiltLeafAmbush extends CardImpl { public GiltLeafAmbush(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{2}{G}"); this.subtype.add(SubType.ELF); // Create two 1/1 green Elf Warrior creature tokens into play. Clash with an opponent. If you win, those creatures gain deathtouch until end of turn diff --git a/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java b/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java index a1b29717fdf..19c30293d53 100644 --- a/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java +++ b/Mage.Sets/src/mage/cards/g/GloryscaleViashino.java @@ -20,7 +20,7 @@ public final class GloryscaleViashino extends CardImpl { public GloryscaleViashino(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{G}{W}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SOLDIER); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GuardianNaga.java b/Mage.Sets/src/mage/cards/g/GuardianNaga.java index 45b4996c22b..b035af53982 100644 --- a/Mage.Sets/src/mage/cards/g/GuardianNaga.java +++ b/Mage.Sets/src/mage/cards/g/GuardianNaga.java @@ -25,7 +25,7 @@ public final class GuardianNaga extends AdventureCard { public GuardianNaga(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, new CardType[]{CardType.INSTANT}, "{5}{W}{W}", "Banishing Coils", "{2}{W}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(5); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java index 2e07cf1e859..68aad58448c 100644 --- a/Mage.Sets/src/mage/cards/g/GurmagDrowner.java +++ b/Mage.Sets/src/mage/cards/g/GurmagDrowner.java @@ -19,7 +19,7 @@ public final class GurmagDrowner extends CardImpl { public GurmagDrowner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HarrierNaga.java b/Mage.Sets/src/mage/cards/h/HarrierNaga.java index 8546ed548ad..829fc1b6331 100644 --- a/Mage.Sets/src/mage/cards/h/HarrierNaga.java +++ b/Mage.Sets/src/mage/cards/h/HarrierNaga.java @@ -17,7 +17,7 @@ public final class HarrierNaga extends CardImpl { public HarrierNaga(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java index 7eece73b886..ccb3dd894ec 100644 --- a/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java +++ b/Mage.Sets/src/mage/cards/h/HivisOfTheScale.java @@ -35,7 +35,7 @@ public final class HivisOfTheScale extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/h/HoodedBrawler.java b/Mage.Sets/src/mage/cards/h/HoodedBrawler.java index 121b5b9fdf0..1c926b86b0a 100644 --- a/Mage.Sets/src/mage/cards/h/HoodedBrawler.java +++ b/Mage.Sets/src/mage/cards/h/HoodedBrawler.java @@ -21,7 +21,7 @@ public final class HoodedBrawler extends CardImpl { public HoodedBrawler(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java b/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java index d0ff1798d16..3c7458d5d71 100644 --- a/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java +++ b/Mage.Sets/src/mage/cards/h/HoofprintsOfTheStag.java @@ -25,7 +25,7 @@ import java.util.UUID; public final class HoofprintsOfTheStag extends CardImpl { public HoofprintsOfTheStag(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{1}{W}"); this.subtype.add(SubType.ELEMENTAL); // Whenever you draw a card, you may put a hoofprint counter on Hoofprints of the Stag. diff --git a/Mage.Sets/src/mage/cards/h/HuntingTriad.java b/Mage.Sets/src/mage/cards/h/HuntingTriad.java index 7d7cc2f58ad..12db59f3587 100644 --- a/Mage.Sets/src/mage/cards/h/HuntingTriad.java +++ b/Mage.Sets/src/mage/cards/h/HuntingTriad.java @@ -17,7 +17,7 @@ import java.util.UUID; public final class HuntingTriad extends CardImpl { public HuntingTriad(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{3}{G}"); this.subtype.add(SubType.ELF); this.getSpellAbility().addEffect(new CreateTokenEffect(new ElfWarriorToken(), 3)); diff --git a/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java b/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java index 876f0673c46..f12a8b43132 100644 --- a/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java +++ b/Mage.Sets/src/mage/cards/i/IdolOfFalseGods.java @@ -36,7 +36,7 @@ public final class IdolOfFalseGods extends CardImpl { } public IdolOfFalseGods(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ARTIFACT}, "{2}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ARTIFACT}, "{2}"); this.subtype.add(SubType.ELDRAZI); diff --git a/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java b/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java index e09b1ff9cdd..f8522b3ecb2 100644 --- a/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java +++ b/Mage.Sets/src/mage/cards/i/IkraShidiqiTheUsurper.java @@ -28,7 +28,7 @@ public final class IkraShidiqiTheUsurper extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{G}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(7); diff --git a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java index a4ff4dfc08a..930e425a1ed 100644 --- a/Mage.Sets/src/mage/cards/i/ImmolationShaman.java +++ b/Mage.Sets/src/mage/cards/i/ImmolationShaman.java @@ -33,7 +33,7 @@ public final class ImmolationShaman extends CardImpl { public ImmolationShaman(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java b/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java index 7e5dab794e0..154d749025d 100644 --- a/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java +++ b/Mage.Sets/src/mage/cards/i/ImotiCelebrantOfBounty.java @@ -30,7 +30,7 @@ public final class ImotiCelebrantOfBounty extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}{U}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.DRUID); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/j/JundSojourners.java b/Mage.Sets/src/mage/cards/j/JundSojourners.java index edf88190961..287bdf1830e 100644 --- a/Mage.Sets/src/mage/cards/j/JundSojourners.java +++ b/Mage.Sets/src/mage/cards/j/JundSojourners.java @@ -24,7 +24,7 @@ public final class JundSojourners extends CardImpl { public JundSojourners(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}{R}{G}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java b/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java index 21cf949e8a3..a1233d73c3c 100644 --- a/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java +++ b/Mage.Sets/src/mage/cards/k/KadenaSlinkingSorcerer.java @@ -43,7 +43,7 @@ public final class KadenaSlinkingSorcerer extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{G}{U}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/k/KadenasSilencer.java b/Mage.Sets/src/mage/cards/k/KadenasSilencer.java index e0435e70804..866bc4b79a9 100644 --- a/Mage.Sets/src/mage/cards/k/KadenasSilencer.java +++ b/Mage.Sets/src/mage/cards/k/KadenasSilencer.java @@ -24,7 +24,7 @@ public final class KadenasSilencer extends CardImpl { public KadenasSilencer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/k/KarsusDepthguard.java b/Mage.Sets/src/mage/cards/k/KarsusDepthguard.java index 316731c167a..b0c9f34985d 100644 --- a/Mage.Sets/src/mage/cards/k/KarsusDepthguard.java +++ b/Mage.Sets/src/mage/cards/k/KarsusDepthguard.java @@ -27,7 +27,7 @@ public final class KarsusDepthguard extends CardImpl { public KarsusDepthguard(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java index 189a5f55400..2007ecb6737 100644 --- a/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java +++ b/Mage.Sets/src/mage/cards/k/KheruSpellsnatcher.java @@ -25,7 +25,7 @@ public final class KheruSpellsnatcher extends CardImpl { public KheruSpellsnatcher(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java b/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java index 20edcd03308..3286a440027 100644 --- a/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java +++ b/Mage.Sets/src/mage/cards/k/KnowledgeExploitation.java @@ -24,7 +24,7 @@ import java.util.UUID; public final class KnowledgeExploitation extends CardImpl { public KnowledgeExploitation(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{5}{U}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{5}{U}{U}"); this.subtype.add(SubType.ROGUE); // Prowl {3}{U} diff --git a/Mage.Sets/src/mage/cards/k/KozileksCommand.java b/Mage.Sets/src/mage/cards/k/KozileksCommand.java index 95c86f2d7b6..af3b2d6b06b 100644 --- a/Mage.Sets/src/mage/cards/k/KozileksCommand.java +++ b/Mage.Sets/src/mage/cards/k/KozileksCommand.java @@ -32,7 +32,7 @@ import java.util.UUID; public final class KozileksCommand extends CardImpl { public KozileksCommand(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{X}{C}{C}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{X}{C}{C}"); this.subtype.add(SubType.ELDRAZI); diff --git a/Mage.Sets/src/mage/cards/k/KyloxVisionaryInventor.java b/Mage.Sets/src/mage/cards/k/KyloxVisionaryInventor.java index ea3ff7c62ac..871529737e2 100644 --- a/Mage.Sets/src/mage/cards/k/KyloxVisionaryInventor.java +++ b/Mage.Sets/src/mage/cards/k/KyloxVisionaryInventor.java @@ -35,7 +35,7 @@ public final class KyloxVisionaryInventor extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{U}{R}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ARTIFICER); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/Lignify.java b/Mage.Sets/src/mage/cards/l/Lignify.java index c76c1af71e9..b30eedf74bc 100644 --- a/Mage.Sets/src/mage/cards/l/Lignify.java +++ b/Mage.Sets/src/mage/cards/l/Lignify.java @@ -25,7 +25,7 @@ import mage.target.common.TargetCreaturePermanent; public final class Lignify extends CardImpl { public Lignify(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{G}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ENCHANTMENT},"{1}{G}"); this.subtype.add(SubType.TREEFOLK); this.subtype.add(SubType.AURA); diff --git a/Mage.Sets/src/mage/cards/m/MerrowCommerce.java b/Mage.Sets/src/mage/cards/m/MerrowCommerce.java index 04fa69444a3..3939b04d65d 100644 --- a/Mage.Sets/src/mage/cards/m/MerrowCommerce.java +++ b/Mage.Sets/src/mage/cards/m/MerrowCommerce.java @@ -23,7 +23,7 @@ public final class MerrowCommerce extends CardImpl { } public MerrowCommerce(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ENCHANTMENT},"{1}{U}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ENCHANTMENT},"{1}{U}"); this.subtype.add(SubType.MERFOLK); diff --git a/Mage.Sets/src/mage/cards/m/MezzioMugger.java b/Mage.Sets/src/mage/cards/m/MezzioMugger.java index a9cdc4c5b7d..aa7e207838c 100644 --- a/Mage.Sets/src/mage/cards/m/MezzioMugger.java +++ b/Mage.Sets/src/mage/cards/m/MezzioMugger.java @@ -26,7 +26,7 @@ public final class MezzioMugger extends CardImpl { public MezzioMugger(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MilitiasPride.java b/Mage.Sets/src/mage/cards/m/MilitiasPride.java index b59a4a23440..b888da5a883 100644 --- a/Mage.Sets/src/mage/cards/m/MilitiasPride.java +++ b/Mage.Sets/src/mage/cards/m/MilitiasPride.java @@ -26,7 +26,7 @@ public final class MilitiasPride extends CardImpl { } public MilitiasPride(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{1}{W}"); this.subtype.add(SubType.KITHKIN); // Whenever a nontoken creature you control attacks, you may pay {W}. If you do, create a 1/1 white Kithkin Soldier creature token that’s tapped and attacking. diff --git a/Mage.Sets/src/mage/cards/m/MindclawShaman.java b/Mage.Sets/src/mage/cards/m/MindclawShaman.java index e7311b824a7..abac4048de8 100644 --- a/Mage.Sets/src/mage/cards/m/MindclawShaman.java +++ b/Mage.Sets/src/mage/cards/m/MindclawShaman.java @@ -26,7 +26,7 @@ public final class MindclawShaman extends CardImpl { public MindclawShaman(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MirrorGolem.java b/Mage.Sets/src/mage/cards/m/MirrorGolem.java index bd367e6d812..0f172cc7318 100644 --- a/Mage.Sets/src/mage/cards/m/MirrorGolem.java +++ b/Mage.Sets/src/mage/cards/m/MirrorGolem.java @@ -116,8 +116,8 @@ class MirrorGolemEffect extends ContinuousEffectImpl { FilterCard filterCard; if (cardType.equals(CardType.SORCERY)) { filterCard = new FilterCard("sorceries"); - } else if (cardType.equals(CardType.TRIBAL)) { - filterCard = new FilterCard("tribal"); + } else if (cardType.equals(CardType.KINDRED)) { + filterCard = new FilterCard("kindred"); } else { filterCard = new FilterCard(cardType.toString() + "s"); } diff --git a/Mage.Sets/src/mage/cards/m/MistSyndicateNaga.java b/Mage.Sets/src/mage/cards/m/MistSyndicateNaga.java index 9f186e82ed7..74fde9cc883 100644 --- a/Mage.Sets/src/mage/cards/m/MistSyndicateNaga.java +++ b/Mage.Sets/src/mage/cards/m/MistSyndicateNaga.java @@ -2,7 +2,6 @@ package mage.cards.m; import mage.MageInt; import mage.abilities.common.DealsCombatDamageToAPlayerTriggeredAbility; -import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.CreateTokenCopySourceEffect; import mage.abilities.keyword.NinjutsuAbility; import mage.cards.CardImpl; @@ -20,7 +19,7 @@ public final class MistSyndicateNaga extends CardImpl { public MistSyndicateNaga(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.NINJA); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/m/MorselTheft.java b/Mage.Sets/src/mage/cards/m/MorselTheft.java index 3ec9b0c9299..141c8a077c2 100644 --- a/Mage.Sets/src/mage/cards/m/MorselTheft.java +++ b/Mage.Sets/src/mage/cards/m/MorselTheft.java @@ -22,7 +22,7 @@ import java.util.UUID; public final class MorselTheft extends CardImpl { public MorselTheft(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{2}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{2}{B}{B}"); this.subtype.add(SubType.ROGUE); // Prowl {1}{B} diff --git a/Mage.Sets/src/mage/cards/n/NagaEternal.java b/Mage.Sets/src/mage/cards/n/NagaEternal.java index 4652ca3e8f5..8c252f7cb79 100644 --- a/Mage.Sets/src/mage/cards/n/NagaEternal.java +++ b/Mage.Sets/src/mage/cards/n/NagaEternal.java @@ -17,7 +17,7 @@ public final class NagaEternal extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(3); this.toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/cards/n/NagaOracle.java b/Mage.Sets/src/mage/cards/n/NagaOracle.java index 8ce3657769a..1321c595d81 100644 --- a/Mage.Sets/src/mage/cards/n/NagaOracle.java +++ b/Mage.Sets/src/mage/cards/n/NagaOracle.java @@ -18,7 +18,7 @@ public final class NagaOracle extends CardImpl { public NagaOracle(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/n/NagaVitalist.java b/Mage.Sets/src/mage/cards/n/NagaVitalist.java index cd60983a852..86da0431b62 100644 --- a/Mage.Sets/src/mage/cards/n/NagaVitalist.java +++ b/Mage.Sets/src/mage/cards/n/NagaVitalist.java @@ -19,7 +19,7 @@ public final class NagaVitalist extends CardImpl { public NagaVitalist(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.DRUID); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/n/NamelessInversion.java b/Mage.Sets/src/mage/cards/n/NamelessInversion.java index 83eba951d37..7df1343a0c3 100644 --- a/Mage.Sets/src/mage/cards/n/NamelessInversion.java +++ b/Mage.Sets/src/mage/cards/n/NamelessInversion.java @@ -20,7 +20,7 @@ import mage.target.common.TargetCreaturePermanent; public final class NamelessInversion extends CardImpl { public NamelessInversion(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{1}{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{1}{B}"); this.subtype.add(SubType.SHAPESHIFTER); diff --git a/Mage.Sets/src/mage/cards/n/NogginWhack.java b/Mage.Sets/src/mage/cards/n/NogginWhack.java index 6440246f8b1..cbe4c43f239 100644 --- a/Mage.Sets/src/mage/cards/n/NogginWhack.java +++ b/Mage.Sets/src/mage/cards/n/NogginWhack.java @@ -16,7 +16,7 @@ import java.util.UUID; public final class NogginWhack extends CardImpl { public NogginWhack(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{2}{B}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{2}{B}{B}"); this.subtype.add(SubType.ROGUE); // Prowl {1}{B} diff --git a/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java b/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java index ed520d023d0..74ed78f3109 100644 --- a/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java +++ b/Mage.Sets/src/mage/cards/n/NotOfThisWorld.java @@ -34,7 +34,7 @@ public final class NotOfThisWorld extends CardImpl { } public NotOfThisWorld(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{7}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{7}"); this.subtype.add(SubType.ELDRAZI); // Counter target spell or ability that targets a permanent you control. diff --git a/Mage.Sets/src/mage/cards/n/NotoriousThrong.java b/Mage.Sets/src/mage/cards/n/NotoriousThrong.java index b6b836eebc6..4d09b3ba44c 100644 --- a/Mage.Sets/src/mage/cards/n/NotoriousThrong.java +++ b/Mage.Sets/src/mage/cards/n/NotoriousThrong.java @@ -27,7 +27,7 @@ import java.util.UUID; public final class NotoriousThrong extends CardImpl { public NotoriousThrong(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{3}{U}"); this.subtype.add(SubType.ROGUE); // Prowl {5}{U} diff --git a/Mage.Sets/src/mage/cards/o/OasisRitualist.java b/Mage.Sets/src/mage/cards/o/OasisRitualist.java index 5819239ab07..eeb0f9157a4 100644 --- a/Mage.Sets/src/mage/cards/o/OasisRitualist.java +++ b/Mage.Sets/src/mage/cards/o/OasisRitualist.java @@ -22,7 +22,7 @@ public final class OasisRitualist extends CardImpl { public OasisRitualist(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java index 087bcdb84e3..b6777ae5581 100644 --- a/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java +++ b/Mage.Sets/src/mage/cards/o/ObsidianBattleAxe.java @@ -26,7 +26,7 @@ public final class ObsidianBattleAxe extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent(SubType.WARRIOR, "a Warrior creature"); public ObsidianBattleAxe(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ARTIFACT},"{3}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ARTIFACT},"{3}"); this.subtype.add(SubType.WARRIOR); this.subtype.add(SubType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/o/OgnisTheDragonsLash.java b/Mage.Sets/src/mage/cards/o/OgnisTheDragonsLash.java index bf4a309ac45..785f8c687c9 100644 --- a/Mage.Sets/src/mage/cards/o/OgnisTheDragonsLash.java +++ b/Mage.Sets/src/mage/cards/o/OgnisTheDragonsLash.java @@ -31,7 +31,7 @@ public final class OgnisTheDragonsLash extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B/R}{R}{R/G}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/o/OmarthisGhostfireInitiate.java b/Mage.Sets/src/mage/cards/o/OmarthisGhostfireInitiate.java index d1326b3782c..917419d0ad6 100644 --- a/Mage.Sets/src/mage/cards/o/OmarthisGhostfireInitiate.java +++ b/Mage.Sets/src/mage/cards/o/OmarthisGhostfireInitiate.java @@ -38,7 +38,7 @@ public final class OmarthisGhostfireInitiate extends CardImpl { this.supertype.add(SuperType.LEGENDARY); this.subtype.add(SubType.SPIRIT); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/p/Peppersmoke.java b/Mage.Sets/src/mage/cards/p/Peppersmoke.java index aa7c08b172e..fc748c115c6 100644 --- a/Mage.Sets/src/mage/cards/p/Peppersmoke.java +++ b/Mage.Sets/src/mage/cards/p/Peppersmoke.java @@ -27,7 +27,7 @@ public final class Peppersmoke extends CardImpl { } public Peppersmoke(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{B}"); this.subtype.add(SubType.FAERIE); diff --git a/Mage.Sets/src/mage/cards/p/PlasmaJockey.java b/Mage.Sets/src/mage/cards/p/PlasmaJockey.java index 2b60e54c2b9..1727f6ca6f0 100644 --- a/Mage.Sets/src/mage/cards/p/PlasmaJockey.java +++ b/Mage.Sets/src/mage/cards/p/PlasmaJockey.java @@ -22,7 +22,7 @@ public final class PlasmaJockey extends CardImpl { public PlasmaJockey(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java b/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java index 05f9c8f00f7..779cbcf48f4 100644 --- a/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java +++ b/Mage.Sets/src/mage/cards/p/ProfanerOfTheDead.java @@ -25,7 +25,7 @@ public final class ProfanerOfTheDead extends CardImpl { public ProfanerOfTheDead(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java index 7c770246b1d..bb254328e08 100644 --- a/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java +++ b/Mage.Sets/src/mage/cards/p/ProwessOfTheFair.java @@ -27,7 +27,7 @@ public final class ProwessOfTheFair extends CardImpl { } public ProwessOfTheFair(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{1}{B}"); this.subtype.add(SubType.ELF); // Whenever another nontoken Elf is put into your graveyard from the battlefield, you may create a 1/1 green Elf Warrior creature token. diff --git a/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java b/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java index 2c7ab603e1e..e19c8699ca0 100644 --- a/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java +++ b/Mage.Sets/src/mage/cards/p/PyreSledgeArsonist.java @@ -37,7 +37,7 @@ public final class PyreSledgeArsonist extends CardImpl { public PyreSledgeArsonist(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PyrotechnicPerformer.java b/Mage.Sets/src/mage/cards/p/PyrotechnicPerformer.java index e4b55c6cc84..79a64f1a860 100644 --- a/Mage.Sets/src/mage/cards/p/PyrotechnicPerformer.java +++ b/Mage.Sets/src/mage/cards/p/PyrotechnicPerformer.java @@ -29,7 +29,7 @@ public final class PyrotechnicPerformer extends CardImpl { public PyrotechnicPerformer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ASSASSIN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/q/QarsiDeceiver.java b/Mage.Sets/src/mage/cards/q/QarsiDeceiver.java index f129a8bd717..a22675957ab 100644 --- a/Mage.Sets/src/mage/cards/q/QarsiDeceiver.java +++ b/Mage.Sets/src/mage/cards/q/QarsiDeceiver.java @@ -27,7 +27,7 @@ public final class QarsiDeceiver extends CardImpl { public QarsiDeceiver(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/r/RalsStaticaster.java b/Mage.Sets/src/mage/cards/r/RalsStaticaster.java index 8581608bf32..0a7a502a778 100644 --- a/Mage.Sets/src/mage/cards/r/RalsStaticaster.java +++ b/Mage.Sets/src/mage/cards/r/RalsStaticaster.java @@ -34,7 +34,7 @@ public final class RalsStaticaster extends CardImpl { public RalsStaticaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WIZARD); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RamunapExcavator.java b/Mage.Sets/src/mage/cards/r/RamunapExcavator.java index 26096ba53c5..6fe090f7033 100644 --- a/Mage.Sets/src/mage/cards/r/RamunapExcavator.java +++ b/Mage.Sets/src/mage/cards/r/RamunapExcavator.java @@ -19,7 +19,7 @@ public final class RamunapExcavator extends CardImpl { public RamunapExcavator(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.CLERIC); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java index 152a707873b..733e3e62252 100644 --- a/Mage.Sets/src/mage/cards/r/ReachOfBranches.java +++ b/Mage.Sets/src/mage/cards/r/ReachOfBranches.java @@ -21,7 +21,7 @@ public final class ReachOfBranches extends CardImpl { private static final FilterLandPermanent filter = new FilterLandPermanent(SubType.FOREST, "a Forest"); public ReachOfBranches(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{4}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{4}{G}"); this.subtype.add(SubType.TREEFOLK); // Create a 2/5 green Treefolk Shaman creature token. diff --git a/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java b/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java index e4af10cb469..0a35a94c990 100644 --- a/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java +++ b/Mage.Sets/src/mage/cards/r/RebellionOfTheFlamekin.java @@ -28,7 +28,7 @@ import java.util.stream.Collectors; public final class RebellionOfTheFlamekin extends CardImpl { public RebellionOfTheFlamekin(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{3}{R}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{3}{R}"); this.subtype.add(SubType.ELEMENTAL); // Whenever you clash, you may pay {1}. If you do create a 3/1 Red Elemental Shaman creature token in play. If you won that token gains haste diff --git a/Mage.Sets/src/mage/cards/r/Retromancer.java b/Mage.Sets/src/mage/cards/r/Retromancer.java index 75c50b888c0..8fc4bb2989e 100644 --- a/Mage.Sets/src/mage/cards/r/Retromancer.java +++ b/Mage.Sets/src/mage/cards/r/Retromancer.java @@ -19,7 +19,7 @@ public final class Retromancer extends CardImpl { public Retromancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RivazOfTheClaw.java b/Mage.Sets/src/mage/cards/r/RivazOfTheClaw.java index 6bc09194c35..d206b3ef84d 100644 --- a/Mage.Sets/src/mage/cards/r/RivazOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/r/RivazOfTheClaw.java @@ -38,7 +38,7 @@ public final class RivazOfTheClaw extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{R}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARLOCK); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RiveteersInitiate.java b/Mage.Sets/src/mage/cards/r/RiveteersInitiate.java index fdbcbfc793f..868c3dacfc0 100644 --- a/Mage.Sets/src/mage/cards/r/RiveteersInitiate.java +++ b/Mage.Sets/src/mage/cards/r/RiveteersInitiate.java @@ -21,7 +21,7 @@ public final class RiveteersInitiate extends CardImpl { public RiveteersInitiate(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.CITIZEN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/r/RiveteersRequisitioner.java b/Mage.Sets/src/mage/cards/r/RiveteersRequisitioner.java index 984d5ee7686..05968004574 100644 --- a/Mage.Sets/src/mage/cards/r/RiveteersRequisitioner.java +++ b/Mage.Sets/src/mage/cards/r/RiveteersRequisitioner.java @@ -20,7 +20,7 @@ public final class RiveteersRequisitioner extends CardImpl { public RiveteersRequisitioner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ROGUE); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/r/Rootgrapple.java b/Mage.Sets/src/mage/cards/r/Rootgrapple.java index c6288004d05..cb783f0270b 100644 --- a/Mage.Sets/src/mage/cards/r/Rootgrapple.java +++ b/Mage.Sets/src/mage/cards/r/Rootgrapple.java @@ -30,7 +30,7 @@ public final class Rootgrapple extends CardImpl { } public Rootgrapple(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{4}{G}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{4}{G}"); this.subtype.add(SubType.TREEFOLK); // Destroy target noncreature permanent. diff --git a/Mage.Sets/src/mage/cards/r/RubblebeltBraggart.java b/Mage.Sets/src/mage/cards/r/RubblebeltBraggart.java index 28cbb640338..c6a955abe55 100644 --- a/Mage.Sets/src/mage/cards/r/RubblebeltBraggart.java +++ b/Mage.Sets/src/mage/cards/r/RubblebeltBraggart.java @@ -23,7 +23,7 @@ public final class RubblebeltBraggart extends CardImpl { public RubblebeltBraggart(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(5); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java b/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java index 7a600898792..87a38834618 100644 --- a/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java +++ b/Mage.Sets/src/mage/cards/r/RubblebeltRunner.java @@ -28,7 +28,7 @@ public final class RubblebeltRunner extends CardImpl { public RubblebeltRunner(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{G}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SagesDousing.java b/Mage.Sets/src/mage/cards/s/SagesDousing.java index 716f4df2d12..6c90b429201 100644 --- a/Mage.Sets/src/mage/cards/s/SagesDousing.java +++ b/Mage.Sets/src/mage/cards/s/SagesDousing.java @@ -27,7 +27,7 @@ public final class SagesDousing extends CardImpl { } public SagesDousing(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{2}{U}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{2}{U}"); this.subtype.add(SubType.WIZARD); // Counter target spell unless its controller pays {3}. diff --git a/Mage.Sets/src/mage/cards/s/SaguArcher.java b/Mage.Sets/src/mage/cards/s/SaguArcher.java index 10ba311b274..8fa338a74da 100644 --- a/Mage.Sets/src/mage/cards/s/SaguArcher.java +++ b/Mage.Sets/src/mage/cards/s/SaguArcher.java @@ -19,7 +19,7 @@ public final class SaguArcher extends CardImpl { public SaguArcher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.ARCHER); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java index 28894657da5..5a3d2cd6158 100644 --- a/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java +++ b/Mage.Sets/src/mage/cards/s/SeerOfTheLastTomorrow.java @@ -25,7 +25,7 @@ public final class SeerOfTheLastTomorrow extends CardImpl { public SeerOfTheLastTomorrow(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.CLERIC); this.power = new MageInt(1); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/ShieldsOfVelisVel.java b/Mage.Sets/src/mage/cards/s/ShieldsOfVelisVel.java index d2801860fd4..b106b59c613 100644 --- a/Mage.Sets/src/mage/cards/s/ShieldsOfVelisVel.java +++ b/Mage.Sets/src/mage/cards/s/ShieldsOfVelisVel.java @@ -23,7 +23,7 @@ import java.util.UUID; public final class ShieldsOfVelisVel extends CardImpl { public ShieldsOfVelisVel(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{W}"); this.subtype.add(SubType.SHAPESHIFTER); // Changeling diff --git a/Mage.Sets/src/mage/cards/s/ShivanSandMage.java b/Mage.Sets/src/mage/cards/s/ShivanSandMage.java index 34ac57b68d4..01645096754 100644 --- a/Mage.Sets/src/mage/cards/s/ShivanSandMage.java +++ b/Mage.Sets/src/mage/cards/s/ShivanSandMage.java @@ -35,7 +35,7 @@ public final class ShivanSandMage extends CardImpl { public ShivanSandMage(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SidewinderNaga.java b/Mage.Sets/src/mage/cards/s/SidewinderNaga.java index 8edb0c6b1ca..8cf2396e2aa 100644 --- a/Mage.Sets/src/mage/cards/s/SidewinderNaga.java +++ b/Mage.Sets/src/mage/cards/s/SidewinderNaga.java @@ -26,7 +26,7 @@ public final class SidewinderNaga extends CardImpl { public SidewinderNaga(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java b/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java index b4eba7dadeb..c17c97435b5 100644 --- a/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java +++ b/Mage.Sets/src/mage/cards/s/SidisiBroodTyrant.java @@ -27,7 +27,7 @@ public final class SidisiBroodTyrant extends CardImpl { public SidisiBroodTyrant(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{G}{U}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java b/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java index 7d0c4264c0c..aa12b21acd8 100644 --- a/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java +++ b/Mage.Sets/src/mage/cards/s/SidisiUndeadVizier.java @@ -24,7 +24,7 @@ public final class SidisiUndeadVizier extends CardImpl { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{B}"); this.supertype.add(SuperType.LEGENDARY); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.power = new MageInt(4); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/s/SidisisFaithful.java b/Mage.Sets/src/mage/cards/s/SidisisFaithful.java index 0af1a31a477..4b1a58b6091 100644 --- a/Mage.Sets/src/mage/cards/s/SidisisFaithful.java +++ b/Mage.Sets/src/mage/cards/s/SidisisFaithful.java @@ -21,7 +21,7 @@ public final class SidisisFaithful extends CardImpl { public SidisisFaithful(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(0); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java b/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java index baf1fb84642..1216cdeb4a0 100644 --- a/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java +++ b/Mage.Sets/src/mage/cards/s/SilumgarSpellEater.java @@ -23,7 +23,7 @@ public final class SilumgarSpellEater extends CardImpl { public SilumgarSpellEater(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SinuousStriker.java b/Mage.Sets/src/mage/cards/s/SinuousStriker.java index 7dd8401ee02..f4f09f9540b 100644 --- a/Mage.Sets/src/mage/cards/s/SinuousStriker.java +++ b/Mage.Sets/src/mage/cards/s/SinuousStriker.java @@ -21,7 +21,7 @@ public final class SinuousStriker extends CardImpl { public SinuousStriker(UUID ownerId, CardSetInfo cardSetInfo) { super(ownerId, cardSetInfo, new CardType[]{CardType.CREATURE}, "{2}{U}"); - subtype.add(SubType.NAGA); + subtype.add(SubType.SNAKE); subtype.add(SubType.WARRIOR); power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SkitteringInvasion.java b/Mage.Sets/src/mage/cards/s/SkitteringInvasion.java index dff5d0c7b54..793ae1f107d 100644 --- a/Mage.Sets/src/mage/cards/s/SkitteringInvasion.java +++ b/Mage.Sets/src/mage/cards/s/SkitteringInvasion.java @@ -17,7 +17,7 @@ import mage.game.permanent.token.EldraziSpawnToken; public final class SkitteringInvasion extends CardImpl { public SkitteringInvasion (UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.SORCERY},"{7}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.SORCERY},"{7}"); this.subtype.add(SubType.ELDRAZI); this.getSpellAbility().addEffect(new CreateTokenEffect(new EldraziSpawnToken(), 5).withTextOptions(true)); } diff --git a/Mage.Sets/src/mage/cards/s/SkyclawThrash.java b/Mage.Sets/src/mage/cards/s/SkyclawThrash.java index 41377c0864e..e24a7d2ccdb 100644 --- a/Mage.Sets/src/mage/cards/s/SkyclawThrash.java +++ b/Mage.Sets/src/mage/cards/s/SkyclawThrash.java @@ -29,7 +29,7 @@ public final class SkyclawThrash extends CardImpl { public SkyclawThrash(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{3}{U}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/s/SlitherBlade.java b/Mage.Sets/src/mage/cards/s/SlitherBlade.java index d3ea9306786..c63cfa009b2 100644 --- a/Mage.Sets/src/mage/cards/s/SlitherBlade.java +++ b/Mage.Sets/src/mage/cards/s/SlitherBlade.java @@ -18,7 +18,7 @@ public final class SlitherBlade extends CardImpl { public SlitherBlade(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.ROGUE); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SpellweaverEternal.java b/Mage.Sets/src/mage/cards/s/SpellweaverEternal.java index 6e34eab94bd..afd2efa7e0e 100644 --- a/Mage.Sets/src/mage/cards/s/SpellweaverEternal.java +++ b/Mage.Sets/src/mage/cards/s/SpellweaverEternal.java @@ -20,7 +20,7 @@ public final class SpellweaverEternal extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/s/StormscaleAnarch.java b/Mage.Sets/src/mage/cards/s/StormscaleAnarch.java index d595d3f818f..c5ce1da7783 100644 --- a/Mage.Sets/src/mage/cards/s/StormscaleAnarch.java +++ b/Mage.Sets/src/mage/cards/s/StormscaleAnarch.java @@ -27,7 +27,7 @@ public final class StormscaleAnarch extends CardImpl { public StormscaleAnarch(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/StreamOfUnconsciousness.java b/Mage.Sets/src/mage/cards/s/StreamOfUnconsciousness.java index 76abdb0aed8..09e875ad99d 100644 --- a/Mage.Sets/src/mage/cards/s/StreamOfUnconsciousness.java +++ b/Mage.Sets/src/mage/cards/s/StreamOfUnconsciousness.java @@ -27,7 +27,7 @@ public final class StreamOfUnconsciousness extends CardImpl { } public StreamOfUnconsciousness(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{U}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{U}"); this.subtype.add(SubType.WIZARD); // Target creature gets -4/-0 until end of turn. diff --git a/Mage.Sets/src/mage/cards/s/SultaiFlayer.java b/Mage.Sets/src/mage/cards/s/SultaiFlayer.java index 62ee730f4a0..6e8247e7659 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiFlayer.java +++ b/Mage.Sets/src/mage/cards/s/SultaiFlayer.java @@ -29,7 +29,7 @@ public final class SultaiFlayer extends CardImpl { public SultaiFlayer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SultaiSkullkeeper.java b/Mage.Sets/src/mage/cards/s/SultaiSkullkeeper.java index 7172a5e88bc..48935b98800 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiSkullkeeper.java +++ b/Mage.Sets/src/mage/cards/s/SultaiSkullkeeper.java @@ -18,7 +18,7 @@ public final class SultaiSkullkeeper extends CardImpl { public SultaiSkullkeeper(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java index 8b5d7af0ed6..f6a1b3df7e2 100644 --- a/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java +++ b/Mage.Sets/src/mage/cards/s/SultaiSoothsayer.java @@ -18,7 +18,7 @@ public final class SultaiSoothsayer extends CardImpl { public SultaiSoothsayer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{G}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java index 95a55524098..490f8067161 100644 --- a/Mage.Sets/src/mage/cards/s/SummonTheSchool.java +++ b/Mage.Sets/src/mage/cards/s/SummonTheSchool.java @@ -29,7 +29,7 @@ public final class SummonTheSchool extends CardImpl { } public SummonTheSchool(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{3}{W}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{3}{W}"); this.subtype.add(SubType.MERFOLK); // Create two 1/1 blue Merfolk Wizard creature tokens. diff --git a/Mage.Sets/src/mage/cards/s/SurgeOfThoughtweft.java b/Mage.Sets/src/mage/cards/s/SurgeOfThoughtweft.java index cdd307aaeb0..8b178d79a86 100644 --- a/Mage.Sets/src/mage/cards/s/SurgeOfThoughtweft.java +++ b/Mage.Sets/src/mage/cards/s/SurgeOfThoughtweft.java @@ -26,7 +26,7 @@ public final class SurgeOfThoughtweft extends CardImpl { } public SurgeOfThoughtweft(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{1}{W}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{1}{W}"); this.subtype.add(SubType.KITHKIN); // Creatures you control get +1/+1 until end of turn. diff --git a/Mage.Sets/src/mage/cards/t/TahCropSkirmisher.java b/Mage.Sets/src/mage/cards/t/TahCropSkirmisher.java index 51071bc5ed6..70246cfb7c1 100644 --- a/Mage.Sets/src/mage/cards/t/TahCropSkirmisher.java +++ b/Mage.Sets/src/mage/cards/t/TahCropSkirmisher.java @@ -19,7 +19,7 @@ public final class TahCropSkirmisher extends CardImpl { public TahCropSkirmisher(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/t/Tarfire.java b/Mage.Sets/src/mage/cards/t/Tarfire.java index d13d44e0c7f..4630a99ffbf 100644 --- a/Mage.Sets/src/mage/cards/t/Tarfire.java +++ b/Mage.Sets/src/mage/cards/t/Tarfire.java @@ -16,7 +16,7 @@ import mage.target.common.TargetAnyTarget; public final class Tarfire extends CardImpl { public Tarfire(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{R}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{R}"); this.subtype.add(SubType.GOBLIN); // Tarfire deals 2 damage to any target. diff --git a/Mage.Sets/src/mage/cards/t/TarmogoyfNest.java b/Mage.Sets/src/mage/cards/t/TarmogoyfNest.java index 66cc1535bcb..1eefbb12b80 100644 --- a/Mage.Sets/src/mage/cards/t/TarmogoyfNest.java +++ b/Mage.Sets/src/mage/cards/t/TarmogoyfNest.java @@ -24,7 +24,7 @@ import java.util.UUID; public final class TarmogoyfNest extends CardImpl { public TarmogoyfNest(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.ENCHANTMENT}, "{2}{G}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.ENCHANTMENT}, "{2}{G}"); this.subtype.add(SubType.LHURGOYF); this.subtype.add(SubType.AURA); diff --git a/Mage.Sets/src/mage/cards/t/ThievesFortune.java b/Mage.Sets/src/mage/cards/t/ThievesFortune.java index 49d03ad88de..7a4e13f72cb 100644 --- a/Mage.Sets/src/mage/cards/t/ThievesFortune.java +++ b/Mage.Sets/src/mage/cards/t/ThievesFortune.java @@ -16,7 +16,7 @@ import mage.constants.SubType; public final class ThievesFortune extends CardImpl { public ThievesFortune(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{2}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{2}{U}"); this.subtype.add(SubType.ROGUE); // Prowl {U} diff --git a/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java b/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java index 1c73879ce90..efb225e9090 100644 --- a/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java +++ b/Mage.Sets/src/mage/cards/t/ThornThrashViashino.java @@ -24,7 +24,7 @@ public final class ThornThrashViashino extends CardImpl { public ThornThrashViashino(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java index 859670d3e60..1b59f2acd78 100644 --- a/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java +++ b/Mage.Sets/src/mage/cards/t/ThornbiteStaff.java @@ -31,7 +31,7 @@ public final class ThornbiteStaff extends CardImpl { private static final FilterPermanent filter = new FilterCreaturePermanent(SubType.SHAMAN, "a Shaman creature"); public ThornbiteStaff(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ARTIFACT},"{2}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ARTIFACT},"{2}"); this.subtype.add(SubType.SHAMAN); this.subtype.add(SubType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java b/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java index 04fbb22fbe1..bdfb2ce261b 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingFrontliner.java @@ -26,7 +26,7 @@ public final class ThrashingFrontliner extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add(SubType.PHYREXIAN); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/ThunderThrashElder.java b/Mage.Sets/src/mage/cards/t/ThunderThrashElder.java index 28c86ac1095..8cc787f71af 100644 --- a/Mage.Sets/src/mage/cards/t/ThunderThrashElder.java +++ b/Mage.Sets/src/mage/cards/t/ThunderThrashElder.java @@ -18,7 +18,7 @@ public final class ThunderThrashElder extends CardImpl { public ThunderThrashElder(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/t/TinStreetGossip.java b/Mage.Sets/src/mage/cards/t/TinStreetGossip.java index 126a63502f0..e05d55186c3 100644 --- a/Mage.Sets/src/mage/cards/t/TinStreetGossip.java +++ b/Mage.Sets/src/mage/cards/t/TinStreetGossip.java @@ -28,7 +28,7 @@ public final class TinStreetGossip extends CardImpl { public TinStreetGossip(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{G}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ADVISOR); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/v/VeteransArmaments.java b/Mage.Sets/src/mage/cards/v/VeteransArmaments.java index 8cea6c057a8..8a187767d04 100644 --- a/Mage.Sets/src/mage/cards/v/VeteransArmaments.java +++ b/Mage.Sets/src/mage/cards/v/VeteransArmaments.java @@ -30,7 +30,7 @@ public final class VeteransArmaments extends CardImpl { private static final DynamicValue xValue = new AttackingCreatureCount(); public VeteransArmaments(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.ARTIFACT},"{2}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.ARTIFACT},"{2}"); this.subtype.add(SubType.SOLDIER); this.subtype.add(SubType.EQUIPMENT); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoBey.java b/Mage.Sets/src/mage/cards/v/ViashinoBey.java index 2ac5310f41e..4e2abd1ee90 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoBey.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoBey.java @@ -32,7 +32,7 @@ public final class ViashinoBey extends CardImpl { public ViashinoBey(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoBladescout.java b/Mage.Sets/src/mage/cards/v/ViashinoBladescout.java index 7c09ca80d48..b0ab548e119 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoBladescout.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoBladescout.java @@ -23,7 +23,7 @@ public final class ViashinoBladescout extends CardImpl { public ViashinoBladescout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoBranchrider.java b/Mage.Sets/src/mage/cards/v/ViashinoBranchrider.java index d2b27a91bb8..80c1bc97bb1 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoBranchrider.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoBranchrider.java @@ -26,7 +26,7 @@ public final class ViashinoBranchrider extends CardImpl { public ViashinoBranchrider(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java b/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java index aef7d23bd5b..d5de6cba53a 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoCutthroat.java @@ -20,7 +20,7 @@ public final class ViashinoCutthroat extends CardImpl { public ViashinoCutthroat(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java index b2b57ef01d0..e5c6e351add 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoFangtail.java @@ -22,7 +22,7 @@ public final class ViashinoFangtail extends CardImpl { public ViashinoFangtail(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoFirstblade.java b/Mage.Sets/src/mage/cards/v/ViashinoFirstblade.java index 155b27d45f1..4a62db900ac 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoFirstblade.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoFirstblade.java @@ -20,7 +20,7 @@ public final class ViashinoFirstblade extends CardImpl { public ViashinoFirstblade(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{W}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java b/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java index d77be97568f..8f7c9de754e 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoGrappler.java @@ -19,7 +19,7 @@ public final class ViashinoGrappler extends CardImpl { public ViashinoGrappler(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java index 5c16ec15f5c..4939c9e8579 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoHeretic.java @@ -2,7 +2,6 @@ package mage.cards.v; import mage.MageInt; import mage.abilities.Ability; -import mage.abilities.Mode; import mage.abilities.common.SimpleActivatedAbility; import mage.abilities.costs.common.TapSourceCost; import mage.abilities.costs.mana.ManaCostsImpl; @@ -27,7 +26,7 @@ public final class ViashinoHeretic extends CardImpl { public ViashinoHeretic(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoLashclaw.java b/Mage.Sets/src/mage/cards/v/ViashinoLashclaw.java index e4ddb9cacac..bb22a046f6b 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoLashclaw.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoLashclaw.java @@ -24,7 +24,7 @@ public final class ViashinoLashclaw extends CardImpl { public ViashinoLashclaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoOutrider.java b/Mage.Sets/src/mage/cards/v/ViashinoOutrider.java index 2e4de572ac5..d5a768e824e 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoOutrider.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoOutrider.java @@ -18,7 +18,7 @@ public final class ViashinoOutrider extends CardImpl { public ViashinoOutrider(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoPyromancer.java b/Mage.Sets/src/mage/cards/v/ViashinoPyromancer.java index b284f72fae9..c50acb652e9 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoPyromancer.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoPyromancer.java @@ -20,7 +20,7 @@ public final class ViashinoPyromancer extends CardImpl { public ViashinoPyromancer(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoRacketeer.java b/Mage.Sets/src/mage/cards/v/ViashinoRacketeer.java index c390053bd7c..4c1d6963b4d 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoRacketeer.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoRacketeer.java @@ -20,7 +20,7 @@ public final class ViashinoRacketeer extends CardImpl { public ViashinoRacketeer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.ROGUE); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoRunner.java b/Mage.Sets/src/mage/cards/v/ViashinoRunner.java index 629f874a3f2..8d14d2b3cfe 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoRunner.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoRunner.java @@ -17,7 +17,7 @@ public final class ViashinoRunner extends CardImpl { public ViashinoRunner(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java b/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java index 388a0e75b4b..c3b00359efb 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandscout.java @@ -20,7 +20,7 @@ public final class ViashinoSandscout extends CardImpl { public ViashinoSandscout(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SCOUT); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java b/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java index 9eb39883412..8c7117c5a6f 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandsprinter.java @@ -23,7 +23,7 @@ public final class ViashinoSandsprinter extends CardImpl { public ViashinoSandsprinter(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java b/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java index c437bef63a9..a4357de2cd4 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandstalker.java @@ -21,7 +21,7 @@ public final class ViashinoSandstalker extends CardImpl { public ViashinoSandstalker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java b/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java index 4a1deb4441e..597b32077d3 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSandswimmer.java @@ -27,7 +27,7 @@ public final class ViashinoSandswimmer extends CardImpl { public ViashinoSandswimmer(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoShanktail.java b/Mage.Sets/src/mage/cards/v/ViashinoShanktail.java index ff77e3573b7..08e67415849 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoShanktail.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoShanktail.java @@ -22,7 +22,7 @@ public final class ViashinoShanktail extends CardImpl { public ViashinoShanktail(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java b/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java index 462a2c189ec..3afef135a36 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSkeleton.java @@ -23,7 +23,7 @@ public final class ViashinoSkeleton extends CardImpl { public ViashinoSkeleton(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SKELETON); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java b/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java index c88518656db..c5d5ae3f168 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSlasher.java @@ -18,7 +18,7 @@ public final class ViashinoSlasher extends CardImpl { public ViashinoSlasher(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java b/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java index 543d7a23f7a..e0c125e743a 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSlaughtermaster.java @@ -22,7 +22,7 @@ public final class ViashinoSlaughtermaster extends CardImpl { public ViashinoSlaughtermaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoSpearhunter.java b/Mage.Sets/src/mage/cards/v/ViashinoSpearhunter.java index bf7aba09948..a6189ae602f 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoSpearhunter.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoSpearhunter.java @@ -17,7 +17,7 @@ public final class ViashinoSpearhunter extends CardImpl { public ViashinoSpearhunter(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoWarrior.java b/Mage.Sets/src/mage/cards/v/ViashinoWarrior.java index 7253d64cdae..fa252197406 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoWarrior.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoWarrior.java @@ -16,7 +16,7 @@ public final class ViashinoWarrior extends CardImpl { public ViashinoWarrior(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/v/ViashinoWeaponsmith.java b/Mage.Sets/src/mage/cards/v/ViashinoWeaponsmith.java index 7b4037fd8f2..cf7169866dc 100644 --- a/Mage.Sets/src/mage/cards/v/ViashinoWeaponsmith.java +++ b/Mage.Sets/src/mage/cards/v/ViashinoWeaponsmith.java @@ -19,7 +19,7 @@ public final class ViashinoWeaponsmith extends CardImpl { public ViashinoWeaponsmith(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/v/VigeanIntuition.java b/Mage.Sets/src/mage/cards/v/VigeanIntuition.java index fff50470d47..819c8594e0d 100644 --- a/Mage.Sets/src/mage/cards/v/VigeanIntuition.java +++ b/Mage.Sets/src/mage/cards/v/VigeanIntuition.java @@ -52,7 +52,7 @@ class VigeanIntuitionEffect extends OneShotEffect { choice.add(CardType.LAND.toString()); choice.add(CardType.PLANESWALKER.toString()); choice.add(CardType.SORCERY.toString()); - choice.add(CardType.TRIBAL.toString()); + choice.add(CardType.KINDRED.toString()); } public VigeanIntuitionEffect() { @@ -103,8 +103,8 @@ class VigeanIntuitionEffect extends OneShotEffect { type = CardType.SORCERY; } else if (chosenType.equals(CardType.PLANESWALKER.toString())) { type = CardType.PLANESWALKER; - } else if (chosenType.equals(CardType.TRIBAL.toString())) { - type = CardType.TRIBAL; + } else if (chosenType.equals(CardType.KINDRED.toString())) { + type = CardType.KINDRED; } if (type != null) { diff --git a/Mage.Sets/src/mage/cards/v/VioletPall.java b/Mage.Sets/src/mage/cards/v/VioletPall.java index 358c084609a..66184057da8 100644 --- a/Mage.Sets/src/mage/cards/v/VioletPall.java +++ b/Mage.Sets/src/mage/cards/v/VioletPall.java @@ -18,7 +18,7 @@ import mage.target.common.TargetCreaturePermanent; public final class VioletPall extends CardImpl { public VioletPall(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.TRIBAL,CardType.INSTANT},"{4}{B}"); + super(ownerId,setInfo,new CardType[]{CardType.KINDRED,CardType.INSTANT},"{4}{B}"); this.subtype.add(SubType.FAERIE); this.getSpellAbility().addEffect(new DestroyTargetEffect()); diff --git a/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java b/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java index b560d5ff305..ea4e9d7892a 100644 --- a/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java +++ b/Mage.Sets/src/mage/cards/v/VizierOfTheMenagerie.java @@ -28,7 +28,7 @@ public final class VizierOfTheMenagerie extends CardImpl { public VizierOfTheMenagerie(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.CLERIC); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java index b1ed72a5ec4..f15c271f54c 100644 --- a/Mage.Sets/src/mage/cards/w/WarrenWeirding.java +++ b/Mage.Sets/src/mage/cards/w/WarrenWeirding.java @@ -29,7 +29,7 @@ import java.util.UUID; public final class WarrenWeirding extends CardImpl { public WarrenWeirding(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.SORCERY}, "{1}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.SORCERY}, "{1}{B}"); this.subtype.add(SubType.GOBLIN); // Target player sacrifices a creature. If a Goblin is sacrificed this way, that player creates two 1/1 black Goblin Rogue creature tokens, and those tokens gain haste until end of turn. diff --git a/Mage.Sets/src/mage/cards/w/WatchfulNaga.java b/Mage.Sets/src/mage/cards/w/WatchfulNaga.java index c0ceeec9437..26f7cd22619 100644 --- a/Mage.Sets/src/mage/cards/w/WatchfulNaga.java +++ b/Mage.Sets/src/mage/cards/w/WatchfulNaga.java @@ -20,7 +20,7 @@ public final class WatchfulNaga extends CardImpl { public WatchfulNaga(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.WIZARD); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/w/WeaverOfCurrents.java b/Mage.Sets/src/mage/cards/w/WeaverOfCurrents.java index 9e3d3a554e4..49a2fc026bf 100644 --- a/Mage.Sets/src/mage/cards/w/WeaverOfCurrents.java +++ b/Mage.Sets/src/mage/cards/w/WeaverOfCurrents.java @@ -21,7 +21,7 @@ public final class WeaverOfCurrents extends CardImpl { public WeaverOfCurrents(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{U}"); - this.subtype.add(SubType.NAGA); + this.subtype.add(SubType.SNAKE); this.subtype.add(SubType.DRUID); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/w/WeepingAngel.java b/Mage.Sets/src/mage/cards/w/WeepingAngel.java index b190976e1bc..3aedf42ed7c 100644 --- a/Mage.Sets/src/mage/cards/w/WeepingAngel.java +++ b/Mage.Sets/src/mage/cards/w/WeepingAngel.java @@ -98,7 +98,7 @@ class WeepingAngelMarbleizeEffect extends ContinuousEffectImpl { return false; } permanent.removeCardType(game, CardType.CREATURE); - if (!permanent.isTribal(game)) { + if (!permanent.isKindred(game)) { permanent.removeAllCreatureTypes(game); } if (permanent.isAttacking() || permanent.getBlocking() > 0) { diff --git a/Mage.Sets/src/mage/cards/w/WingsOfVelisVel.java b/Mage.Sets/src/mage/cards/w/WingsOfVelisVel.java index 48da2f53c77..a80195da77c 100644 --- a/Mage.Sets/src/mage/cards/w/WingsOfVelisVel.java +++ b/Mage.Sets/src/mage/cards/w/WingsOfVelisVel.java @@ -20,7 +20,7 @@ import java.util.UUID; public final class WingsOfVelisVel extends CardImpl { public WingsOfVelisVel(UUID ownerId, CardSetInfo setInfo) { - super(ownerId, setInfo, new CardType[]{CardType.TRIBAL, CardType.INSTANT}, "{1}{U}"); + super(ownerId, setInfo, new CardType[]{CardType.KINDRED, CardType.INSTANT}, "{1}{U}"); this.subtype.add(SubType.SHAPESHIFTER); // Changeling diff --git a/Mage.Sets/src/mage/cards/w/WorldQueller.java b/Mage.Sets/src/mage/cards/w/WorldQueller.java index 38240821f0b..889a6de20d2 100644 --- a/Mage.Sets/src/mage/cards/w/WorldQueller.java +++ b/Mage.Sets/src/mage/cards/w/WorldQueller.java @@ -61,7 +61,7 @@ class WorldQuellerEffect extends OneShotEffect { choice.add(CardType.LAND.toString()); choice.add(CardType.PLANESWALKER.toString()); choice.add(CardType.SORCERY.toString()); - choice.add(CardType.TRIBAL.toString()); + choice.add(CardType.KINDRED.toString()); } public WorldQuellerEffect() { @@ -105,8 +105,8 @@ class WorldQuellerEffect extends OneShotEffect { type = CardType.SORCERY; } else if (chosenType.equals(CardType.PLANESWALKER.toString())) { type = CardType.PLANESWALKER; - } else if (chosenType.equals(CardType.TRIBAL.toString())) { - type = CardType.TRIBAL; + } else if (chosenType.equals(CardType.KINDRED.toString())) { + type = CardType.KINDRED; } if (type != null) { FilterControlledPermanent filter = new FilterControlledPermanent("permanent you control of type " + type.toString()); diff --git a/Mage.Sets/src/mage/cards/y/YurlokOfScorchThrash.java b/Mage.Sets/src/mage/cards/y/YurlokOfScorchThrash.java index f4fa295a8ae..874955d7c42 100644 --- a/Mage.Sets/src/mage/cards/y/YurlokOfScorchThrash.java +++ b/Mage.Sets/src/mage/cards/y/YurlokOfScorchThrash.java @@ -29,7 +29,7 @@ public final class YurlokOfScorchThrash extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{R}{G}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java b/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java index 918eca4810a..a319f223579 100644 --- a/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java +++ b/Mage.Sets/src/mage/cards/z/ZiatorasEnvoy.java @@ -28,7 +28,7 @@ public final class ZiatorasEnvoy extends CardImpl { public ZiatorasEnvoy(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}{R}{G}"); - this.subtype.add(SubType.VIASHINO); + this.subtype.add(SubType.LIZARD); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(5); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java index 4345c42f472..7fa61fc4ef9 100644 --- a/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java +++ b/Mage.Sets/src/mage/cards/z/ZirilanOfTheClaw.java @@ -34,7 +34,7 @@ public final class ZirilanOfTheClaw extends CardImpl { public ZirilanOfTheClaw(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}"); this.supertype.add(SuperType.LEGENDARY); - this.subtype.add(SubType.VIASHINO, SubType.SHAMAN); + this.subtype.add(SubType.LIZARD, SubType.SHAMAN); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java index 9eb1e3e49bb..3b066bf2145 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/copy/PhantasmalImageTest.java @@ -638,7 +638,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { } @Test - public void testAnimatedTribal() { + public void testAnimatedKindred() { addCard(Zone.BATTLEFIELD, playerB, "Cloak and Dagger"); addCard(Zone.BATTLEFIELD, playerA, "Island", 4); addCard(Zone.HAND, playerA, "Karn's Touch"); @@ -654,7 +654,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { Permanent cloakA = getPermanent("Cloak and Dagger", playerA); assertTrue("Phantasmal Image should be an artifact", cloakA.isArtifact(currentGame)); - assertTrue("Phantasmal Image should be tribal", cloakA.isTribal(currentGame)); + assertTrue("Phantasmal Image should be kindred", cloakA.isKindred(currentGame)); assertTrue("Phantasmal Image should not be a creature", !cloakA.isCreature(currentGame)); assertTrue("Phantasmal Image should be a Rogue", cloakA.hasSubtype(SubType.ROGUE, currentGame)); assertTrue("Phantasmal Image should be an Illusion", cloakA.hasSubtype(SubType.ILLUSION, currentGame)); @@ -664,7 +664,7 @@ public class PhantasmalImageTest extends CardTestPlayerBase { Permanent cloakB = getPermanent("Cloak and Dagger", playerB); assertTrue("Cloak and Dagger should be an artifact", cloakB.isArtifact(currentGame)); assertTrue("Cloak and Dagger should be a creature", cloakB.isCreature(currentGame)); - assertTrue("Cloak and Dagger should be tribal", cloakB.isTribal(currentGame)); + assertTrue("Cloak and Dagger should be kindred", cloakB.isKindred(currentGame)); assertTrue("Cloak and Dagger should be a Rogue", cloakB.hasSubtype(SubType.ROGUE, currentGame)); assertTrue("Cloak and Dagger should be an Equipment", cloakB.hasSubtype(SubType.EQUIPMENT, currentGame)); } diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/single/thb/OneWithTheStarsTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/single/thb/OneWithTheStarsTest.java index 8f7dcb38598..fd9314023b4 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/single/thb/OneWithTheStarsTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/single/thb/OneWithTheStarsTest.java @@ -97,7 +97,7 @@ public class OneWithTheStarsTest extends CardTestPlayerBase { execute(); assertType(blossom, CardType.ENCHANTMENT, true); - assertType(blossom, CardType.TRIBAL, false); + assertType(blossom, CardType.KINDRED, false); assertNotSubtype(blossom, SubType.FAERIE); } } diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index d417c386689..691c76942b4 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -142,11 +142,6 @@ public class VerifyCardDataTest { skipListAddName(SKIP_LIST_TYPE, "UNH", "Old Fogey"); // uses summon word as a joke card skipListAddName(SKIP_LIST_TYPE, "UND", "Old Fogey"); skipListAddName(SKIP_LIST_TYPE, "UST", "capital offense"); // uses "instant" instead "Instant" as a joke card - skipListAddName(SKIP_LIST_TYPE, "MH3", "Echoes of Eternity"); // temporary, waiting for tribal -> kindred change - skipListAddName(SKIP_LIST_TYPE, "MH3", "Idol of False Gods"); // temporary, waiting for tribal -> kindred change - skipListAddName(SKIP_LIST_TYPE, "M3C", "Tarmogoyf Nest"); // temporary, waiting for tribal -> kindred change - skipListAddName(SKIP_LIST_TYPE, "MH3", "Kozilek's Command"); // temporary, waiting for tribal -> kindred change - skipListAddName(SKIP_LIST_TYPE, "M3C", "Eldritch Immunity"); // temporary, waiting for tribal -> kindred change // subtype // skipListAddName(SKIP_LIST_SUBTYPE, set, cardName); @@ -160,7 +155,7 @@ public class VerifyCardDataTest { // rarity // skipListAddName(SKIP_LIST_RARITY, set, cardName); skipListAddName(SKIP_LIST_RARITY, "CMR", "The Prismatic Piper"); // Collation is not yet set up for CMR https://www.lethe.xyz/mtg/collation/cmr.html - + // missing abilities // skipListAddName(SKIP_LIST_MISSING_ABILITIES, set, cardName); diff --git a/Mage/src/main/java/mage/MageObject.java b/Mage/src/main/java/mage/MageObject.java index c5b498ae270..660759e8ab5 100644 --- a/Mage/src/main/java/mage/MageObject.java +++ b/Mage/src/main/java/mage/MageObject.java @@ -251,12 +251,12 @@ public interface MageObject extends MageItem, Serializable, Copyable return getCardType(game).contains(CardType.PLANESWALKER); } - default boolean isTribal() { - return isTribal(null); + default boolean isKindred() { + return isKindred(null); } - default boolean isTribal(Game game) { - return getCardType(game).contains(CardType.TRIBAL); + default boolean isKindred(Game game) { + return getCardType(game).contains(CardType.KINDRED); } default boolean isBattle() { @@ -567,10 +567,10 @@ public interface MageObject extends MageItem, Serializable, Copyable } default boolean shareCreatureTypes(Game game, MageObject otherCard) { - if (!isCreature(game) && !isTribal(game)) { + if (!isCreature(game) && !isKindred(game)) { return false; } - if (!otherCard.isCreature(game) && !otherCard.isTribal(game)) { + if (!otherCard.isCreature(game) && !otherCard.isKindred(game)) { return false; } boolean isAllA = this.isAllCreatureTypes(game); diff --git a/Mage/src/main/java/mage/MageObjectImpl.java b/Mage/src/main/java/mage/MageObjectImpl.java index 02d88de6f35..51a2dd48d67 100644 --- a/Mage/src/main/java/mage/MageObjectImpl.java +++ b/Mage/src/main/java/mage/MageObjectImpl.java @@ -366,12 +366,12 @@ public abstract class MageObjectImpl implements MageObject { @Override public void setIsAllCreatureTypes(boolean value) { - this.getSubtype().setIsAllCreatureTypes(value && (this.isTribal() || this.isCreature())); + this.getSubtype().setIsAllCreatureTypes(value && (this.isKindred() || this.isCreature())); } @Override public void setIsAllCreatureTypes(Game game, boolean value) { - this.getSubtype(game).setIsAllCreatureTypes(value && (this.isTribal(game) || this.isCreature(game))); + this.getSubtype(game).setIsAllCreatureTypes(value && (this.isKindred(game) || this.isCreature(game))); } @Override diff --git a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java index c8f0efbfb39..9f9c1df2379 100644 --- a/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java +++ b/Mage/src/main/java/mage/abilities/effects/common/continuous/LoseCreatureTypeSourceEffect.java @@ -62,7 +62,7 @@ public class LoseCreatureTypeSourceEffect extends ContinuousEffectImpl { return false; } permanent.removeCardType(game, CardType.CREATURE); - if (!permanent.isTribal(game)) { + if (!permanent.isKindred(game)) { permanent.removeAllCreatureTypes(game); } if (permanent.isAttacking() || permanent.getBlocking() > 0) { diff --git a/Mage/src/main/java/mage/constants/CardType.java b/Mage/src/main/java/mage/constants/CardType.java index 1259b1c4764..f372fd82caf 100644 --- a/Mage/src/main/java/mage/constants/CardType.java +++ b/Mage/src/main/java/mage/constants/CardType.java @@ -25,7 +25,7 @@ public enum CardType { PLANESWALKER("Planeswalker", true, true), SCHEME("Scheme", false, false), SORCERY("Sorcery", false, true), - TRIBAL("Tribal", false, false), + KINDRED("Kindred", false, false), VANGUARD("Vanguard", false, false); private final String text; diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index 37830d4ebff..83ac3877a4f 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -62,7 +62,7 @@ public enum SubType { POWERSTONE("Powerstone", SubTypeSet.ArtifactType), TREASURE("Treasure", SubTypeSet.ArtifactType), VEHICLE("Vehicle", SubTypeSet.ArtifactType), - // 205.3m : Creatures and tribals share their lists of subtypes; these subtypes are called creature types. + // 205.3m : Creatures and kindreds share their lists of subtypes; these subtypes are called creature types. // A ADVISOR("Advisor", SubTypeSet.CreatureType), AETHERBORN("Aetherborn", SubTypeSet.CreatureType), @@ -278,7 +278,6 @@ public enum SubType { MYR("Myr", SubTypeSet.CreatureType), MYSTIC("Mystic", SubTypeSet.CreatureType), // N - NAGA("Naga", SubTypeSet.CreatureType), NAUTILUS("Nautilus", SubTypeSet.CreatureType), NAUTOLAN("Nautolan", SubTypeSet.CreatureType, true), // Star Wars NECRON("Necron", SubTypeSet.CreatureType), @@ -413,7 +412,6 @@ public enum SubType { VAMPIRE("Vampire", SubTypeSet.CreatureType), VARMINT("Varmint", SubTypeSet.CreatureType), VEDALKEN("Vedalken", SubTypeSet.CreatureType), - VIASHINO("Viashino", SubTypeSet.CreatureType), VILLAIN("Villain", SubTypeSet.CreatureType, true), // Unstable VOLVER("Volver", SubTypeSet.CreatureType), // W @@ -650,7 +648,7 @@ public enum SubType { public boolean canGain(Game game, MageObject mageObject) { switch (subTypeSet) { case CreatureType: - return mageObject.isCreature(game) || mageObject.isTribal(game); + return mageObject.isCreature(game) || mageObject.isKindred(game); case BasicLandType: case NonBasicLandType: return mageObject.isLand(game); diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index d708c968237..e17ffc41f69 100755 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -78,8 +78,7 @@ $cardTypes{'Instant'} = 'CardType.INSTANT'; $cardTypes{'Land'} = 'CardType.LAND'; $cardTypes{'Sorcery'} = 'CardType.SORCERY'; $cardTypes{'Planeswalker'} = 'CardType.PLANESWALKER'; -$cardTypes{'Tribal'} = 'CardType.TRIBAL'; -$cardTypes{'Kindred'} = 'CardType.TRIBAL'; +$cardTypes{'Kindred'} = 'CardType.KINDRED'; $cardTypes{'Battle'} = 'CardType.BATTLE'; my %raritiesConversion;