From 74b6626020f3baed2b9880ca5aa372e921118aa3 Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Fri, 5 Jun 2020 20:17:41 -0400 Subject: [PATCH] changed Hound to Dog --- .../src/mage/cards/a/AbzanBeastmaster.java | 2 +- .../src/mage/cards/a/AerieBowmasters.java | 2 +- .../src/mage/cards/a/AffaGuardHound.java | 2 +- .../src/mage/cards/a/AinokArtillerist.java | 2 +- Mage.Sets/src/mage/cards/a/AinokBondKin.java | 2 +- Mage.Sets/src/mage/cards/a/AinokGuide.java | 2 +- .../src/mage/cards/a/AinokSurvivalist.java | 2 +- Mage.Sets/src/mage/cards/a/AinokTracker.java | 2 +- Mage.Sets/src/mage/cards/a/AkroanMastiff.java | 2 +- Mage.Sets/src/mage/cards/a/AshmouthHound.java | 2 +- Mage.Sets/src/mage/cards/b/BINGO.java | 2 +- Mage.Sets/src/mage/cards/b/Banehound.java | 2 +- .../src/mage/cards/b/BlazingHellhound.java | 2 +- Mage.Sets/src/mage/cards/b/BloodHound.java | 2 +- Mage.Sets/src/mage/cards/b/BorosMastiff.java | 2 +- .../src/mage/cards/c/CatharsCompanion.java | 2 +- Mage.Sets/src/mage/cards/c/CausticHound.java | 2 +- .../src/mage/cards/c/ChakramRetriever.java | 2 +- .../src/mage/cards/c/ChampionOfArashin.java | 2 +- Mage.Sets/src/mage/cards/c/CorpseCur.java | 2 +- Mage.Sets/src/mage/cards/d/DrossRipper.java | 2 +- .../src/mage/cards/e/ElvenWarhounds.java | 2 +- .../src/mage/cards/e/EncampmentKeeper.java | 2 +- .../src/mage/cards/f/FieryHellhound.java | 2 +- Mage.Sets/src/mage/cards/f/FilthyCur.java | 2 +- Mage.Sets/src/mage/cards/g/GateHound.java | 2 +- Mage.Sets/src/mage/cards/g/GhostHounds.java | 2 +- Mage.Sets/src/mage/cards/g/GoreVassal.java | 2 +- .../src/mage/cards/g/GreaterMossdog.java | 2 +- Mage.Sets/src/mage/cards/g/GuardDogs.java | 2 +- .../src/mage/cards/h/HellfireMongrel.java | 2 +- Mage.Sets/src/mage/cards/h/HollowDogs.java | 2 +- .../src/mage/cards/h/HollowbornBarghest.java | 2 +- .../src/mage/cards/h/HoundOfGriselbrand.java | 2 +- .../src/mage/cards/h/HoundOfTheFarbogs.java | 2 +- Mage.Sets/src/mage/cards/h/Hydradoodle.java | 2 +- .../src/mage/cards/i/ImmolatingSouleater.java | 2 +- .../src/mage/cards/i/IsamaruHoundOfKonda.java | 2 +- .../src/mage/cards/k/KarplusanHound.java | 2 +- .../mage/cards/k/KunorosHoundOfAthreos.java | 2 +- Mage.Sets/src/mage/cards/l/LavaHounds.java | 2 +- Mage.Sets/src/mage/cards/l/Leashling.java | 2 +- .../src/mage/cards/l/LightningHounds.java | 2 +- Mage.Sets/src/mage/cards/l/LongshotSquad.java | 2 +- .../src/mage/cards/l/LurkingJackals.java | 2 +- Mage.Sets/src/mage/cards/m/MadDog.java | 2 +- .../src/mage/cards/m/MogissWarhound.java | 2 +- Mage.Sets/src/mage/cards/m/MongrelPack.java | 41 ++++--------------- .../src/mage/cards/m/MonstrousHound.java | 2 +- Mage.Sets/src/mage/cards/m/MoonEatingDog.java | 2 +- Mage.Sets/src/mage/cards/m/MortisDogs.java | 2 +- Mage.Sets/src/mage/cards/m/Mossdog.java | 2 +- .../src/mage/cards/m/MowuLoyalCompanion.java | 2 +- Mage.Sets/src/mage/cards/p/PackMastiff.java | 2 +- .../src/mage/cards/p/PakoArcaneRetriever.java | 2 +- Mage.Sets/src/mage/cards/p/PatrolHound.java | 2 +- Mage.Sets/src/mage/cards/p/PhantomWhelp.java | 2 +- Mage.Sets/src/mage/cards/p/PlagueDogs.java | 2 +- Mage.Sets/src/mage/cards/p/PyreHound.java | 2 +- .../src/mage/cards/r/RakdosRagemutt.java | 2 +- .../src/mage/cards/r/ResoluteWatchdog.java | 2 +- .../src/mage/cards/s/SaltRoadAmbushers.java | 2 +- .../src/mage/cards/s/SandsteppeScavenger.java | 2 +- .../src/mage/cards/s/ScrapyardMongrel.java | 2 +- Mage.Sets/src/mage/cards/s/SnowHound.java | 2 +- .../src/mage/cards/t/ThrabenFoulbloods.java | 2 +- .../src/mage/cards/t/ThrabenPurebloods.java | 2 +- .../src/mage/cards/t/ThrashingMossdog.java | 2 +- .../src/mage/cards/t/TwoHeadedCerberus.java | 2 +- .../src/mage/cards/u/UnderworldCerberus.java | 2 +- .../src/mage/cards/u/UnderworldRageHound.java | 2 +- Mage.Sets/src/mage/cards/v/VampireHounds.java | 2 +- .../src/mage/cards/w/WarclampMastiff.java | 2 +- Mage.Sets/src/mage/cards/w/Watchdog.java | 2 +- Mage.Sets/src/mage/cards/w/WildDogs.java | 2 +- Mage.Sets/src/mage/cards/w/WildMongrel.java | 2 +- .../src/mage/cards/w/WildfireCerberus.java | 2 +- Mage.Sets/src/mage/cards/z/ZodiacDog.java | 2 +- .../java/mage/verify/VerifyCardDataTest.java | 3 ++ .../src/main/java/mage/constants/SubType.java | 2 +- .../token/{HoundToken.java => DogToken.java} | 20 ++++----- .../mage/game/permanent/token/MowuToken.java | 5 +-- 82 files changed, 101 insertions(+), 124 deletions(-) rename Mage/src/main/java/mage/game/permanent/token/{HoundToken.java => DogToken.java} (53%) diff --git a/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java b/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java index e050309518..76707204e8 100644 --- a/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java +++ b/Mage.Sets/src/mage/cards/a/AbzanBeastmaster.java @@ -21,7 +21,7 @@ public final class AbzanBeastmaster extends CardImpl { public AbzanBeastmaster(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java index 8d4f11ce50..baac41ba67 100644 --- a/Mage.Sets/src/mage/cards/a/AerieBowmasters.java +++ b/Mage.Sets/src/mage/cards/a/AerieBowmasters.java @@ -19,7 +19,7 @@ public final class AerieBowmasters extends CardImpl { public AerieBowmasters(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.ARCHER); this.power = new MageInt(3); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/a/AffaGuardHound.java b/Mage.Sets/src/mage/cards/a/AffaGuardHound.java index a5415096b0..419bf0c33e 100644 --- a/Mage.Sets/src/mage/cards/a/AffaGuardHound.java +++ b/Mage.Sets/src/mage/cards/a/AffaGuardHound.java @@ -23,7 +23,7 @@ public final class AffaGuardHound extends CardImpl { public AffaGuardHound (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java index 589990f025..ffb5401177 100644 --- a/Mage.Sets/src/mage/cards/a/AinokArtillerist.java +++ b/Mage.Sets/src/mage/cards/a/AinokArtillerist.java @@ -23,7 +23,7 @@ public final class AinokArtillerist extends CardImpl { public AinokArtillerist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.ARCHER); this.power = new MageInt(4); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokBondKin.java b/Mage.Sets/src/mage/cards/a/AinokBondKin.java index ccec3c06fc..5c0aea14cf 100644 --- a/Mage.Sets/src/mage/cards/a/AinokBondKin.java +++ b/Mage.Sets/src/mage/cards/a/AinokBondKin.java @@ -33,7 +33,7 @@ public final class AinokBondKin extends CardImpl { public AinokBondKin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SOLDIER); this.power = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AinokGuide.java b/Mage.Sets/src/mage/cards/a/AinokGuide.java index 2136d4f976..b59cd42b1b 100644 --- a/Mage.Sets/src/mage/cards/a/AinokGuide.java +++ b/Mage.Sets/src/mage/cards/a/AinokGuide.java @@ -25,7 +25,7 @@ public final class AinokGuide extends CardImpl { public AinokGuide(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SCOUT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java index 0a406fc343..aa812a835d 100644 --- a/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java +++ b/Mage.Sets/src/mage/cards/a/AinokSurvivalist.java @@ -31,7 +31,7 @@ public final class AinokSurvivalist extends CardImpl { public AinokSurvivalist(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SHAMAN); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/a/AinokTracker.java b/Mage.Sets/src/mage/cards/a/AinokTracker.java index 1c3d8b1475..c4909ef07e 100644 --- a/Mage.Sets/src/mage/cards/a/AinokTracker.java +++ b/Mage.Sets/src/mage/cards/a/AinokTracker.java @@ -19,7 +19,7 @@ public final class AinokTracker extends CardImpl { public AinokTracker(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SCOUT); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java index f1e385cde9..7b61b400b2 100644 --- a/Mage.Sets/src/mage/cards/a/AkroanMastiff.java +++ b/Mage.Sets/src/mage/cards/a/AkroanMastiff.java @@ -23,7 +23,7 @@ public final class AkroanMastiff extends CardImpl { public AkroanMastiff(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/a/AshmouthHound.java b/Mage.Sets/src/mage/cards/a/AshmouthHound.java index 15e10029c7..dda0221e81 100644 --- a/Mage.Sets/src/mage/cards/a/AshmouthHound.java +++ b/Mage.Sets/src/mage/cards/a/AshmouthHound.java @@ -19,7 +19,7 @@ public final class AshmouthHound extends CardImpl { public AshmouthHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/b/BINGO.java b/Mage.Sets/src/mage/cards/b/BINGO.java index 185acbd19d..d6d4b004a2 100644 --- a/Mage.Sets/src/mage/cards/b/BINGO.java +++ b/Mage.Sets/src/mage/cards/b/BINGO.java @@ -39,7 +39,7 @@ public final class BINGO extends CardImpl { public BINGO(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/b/Banehound.java b/Mage.Sets/src/mage/cards/b/Banehound.java index 493e33caa6..20f196c29a 100644 --- a/Mage.Sets/src/mage/cards/b/Banehound.java +++ b/Mage.Sets/src/mage/cards/b/Banehound.java @@ -19,7 +19,7 @@ public final class Banehound extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{B}"); this.subtype.add(SubType.NIGHTMARE); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java index 65ed6aee7c..61d0e0f67e 100644 --- a/Mage.Sets/src/mage/cards/b/BlazingHellhound.java +++ b/Mage.Sets/src/mage/cards/b/BlazingHellhound.java @@ -25,7 +25,7 @@ public final class BlazingHellhound extends CardImpl { public BlazingHellhound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}{R}"); - this.subtype.add(SubType.ELEMENTAL, SubType.HOUND); + this.subtype.add(SubType.ELEMENTAL, SubType.DOG); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/b/BloodHound.java b/Mage.Sets/src/mage/cards/b/BloodHound.java index f182a4b5e3..98e7ef6b12 100644 --- a/Mage.Sets/src/mage/cards/b/BloodHound.java +++ b/Mage.Sets/src/mage/cards/b/BloodHound.java @@ -26,7 +26,7 @@ public final class BloodHound extends CardImpl { public BloodHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/b/BorosMastiff.java b/Mage.Sets/src/mage/cards/b/BorosMastiff.java index 9d2e118ed8..35811ff779 100644 --- a/Mage.Sets/src/mage/cards/b/BorosMastiff.java +++ b/Mage.Sets/src/mage/cards/b/BorosMastiff.java @@ -23,7 +23,7 @@ public final class BorosMastiff extends CardImpl { public BorosMastiff (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CatharsCompanion.java b/Mage.Sets/src/mage/cards/c/CatharsCompanion.java index d26614f24f..f42b71fd1e 100644 --- a/Mage.Sets/src/mage/cards/c/CatharsCompanion.java +++ b/Mage.Sets/src/mage/cards/c/CatharsCompanion.java @@ -27,7 +27,7 @@ public final class CatharsCompanion extends CardImpl { public CatharsCompanion(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/c/CausticHound.java b/Mage.Sets/src/mage/cards/c/CausticHound.java index 021f30af70..266d106cec 100644 --- a/Mage.Sets/src/mage/cards/c/CausticHound.java +++ b/Mage.Sets/src/mage/cards/c/CausticHound.java @@ -19,7 +19,7 @@ public final class CausticHound extends CardImpl { public CausticHound (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{5}{B}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/ChakramRetriever.java b/Mage.Sets/src/mage/cards/c/ChakramRetriever.java index 5f606092e5..19fc2daf8e 100644 --- a/Mage.Sets/src/mage/cards/c/ChakramRetriever.java +++ b/Mage.Sets/src/mage/cards/c/ChakramRetriever.java @@ -25,7 +25,7 @@ public final class ChakramRetriever extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{U}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java b/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java index 52d66a318c..a9941dacae 100644 --- a/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java +++ b/Mage.Sets/src/mage/cards/c/ChampionOfArashin.java @@ -17,7 +17,7 @@ public final class ChampionOfArashin extends CardImpl { public ChampionOfArashin(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/c/CorpseCur.java b/Mage.Sets/src/mage/cards/c/CorpseCur.java index 617c260215..79144ef43c 100644 --- a/Mage.Sets/src/mage/cards/c/CorpseCur.java +++ b/Mage.Sets/src/mage/cards/c/CorpseCur.java @@ -30,7 +30,7 @@ public final class CorpseCur extends CardImpl { public CorpseCur (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); this.addAbility(InfectAbility.getInstance()); diff --git a/Mage.Sets/src/mage/cards/d/DrossRipper.java b/Mage.Sets/src/mage/cards/d/DrossRipper.java index d9867e585f..836f431631 100644 --- a/Mage.Sets/src/mage/cards/d/DrossRipper.java +++ b/Mage.Sets/src/mage/cards/d/DrossRipper.java @@ -22,7 +22,7 @@ public final class DrossRipper extends CardImpl { public DrossRipper (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{4}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{2}{B}"))); diff --git a/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java b/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java index e34c197214..6809e3f232 100644 --- a/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java +++ b/Mage.Sets/src/mage/cards/e/ElvenWarhounds.java @@ -19,7 +19,7 @@ public final class ElvenWarhounds extends CardImpl { public ElvenWarhounds(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java b/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java index 13fb82d3cb..d2c401c54f 100644 --- a/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java +++ b/Mage.Sets/src/mage/cards/e/EncampmentKeeper.java @@ -26,7 +26,7 @@ public final class EncampmentKeeper extends CardImpl { public EncampmentKeeper(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/f/FieryHellhound.java b/Mage.Sets/src/mage/cards/f/FieryHellhound.java index 62815a4ed5..8381f487ef 100644 --- a/Mage.Sets/src/mage/cards/f/FieryHellhound.java +++ b/Mage.Sets/src/mage/cards/f/FieryHellhound.java @@ -23,7 +23,7 @@ public final class FieryHellhound extends CardImpl { public FieryHellhound(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/f/FilthyCur.java b/Mage.Sets/src/mage/cards/f/FilthyCur.java index 9864aec012..e47525388a 100644 --- a/Mage.Sets/src/mage/cards/f/FilthyCur.java +++ b/Mage.Sets/src/mage/cards/f/FilthyCur.java @@ -23,7 +23,7 @@ public final class FilthyCur extends CardImpl { public FilthyCur(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{B}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/g/GateHound.java b/Mage.Sets/src/mage/cards/g/GateHound.java index c25ebded1b..357df06b8f 100644 --- a/Mage.Sets/src/mage/cards/g/GateHound.java +++ b/Mage.Sets/src/mage/cards/g/GateHound.java @@ -24,7 +24,7 @@ public final class GateHound extends CardImpl { public GateHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/g/GhostHounds.java b/Mage.Sets/src/mage/cards/g/GhostHounds.java index 1dcdcad465..cac1255c0a 100644 --- a/Mage.Sets/src/mage/cards/g/GhostHounds.java +++ b/Mage.Sets/src/mage/cards/g/GhostHounds.java @@ -31,7 +31,7 @@ public final class GhostHounds extends CardImpl { public GhostHounds(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{B}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SPIRIT); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/g/GoreVassal.java b/Mage.Sets/src/mage/cards/g/GoreVassal.java index cdfbfbb094..4435be0dac 100644 --- a/Mage.Sets/src/mage/cards/g/GoreVassal.java +++ b/Mage.Sets/src/mage/cards/g/GoreVassal.java @@ -23,7 +23,7 @@ public final class GoreVassal extends CardImpl { public GoreVassal(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/g/GreaterMossdog.java b/Mage.Sets/src/mage/cards/g/GreaterMossdog.java index 605af0ca90..13c03b9187 100644 --- a/Mage.Sets/src/mage/cards/g/GreaterMossdog.java +++ b/Mage.Sets/src/mage/cards/g/GreaterMossdog.java @@ -18,7 +18,7 @@ public final class GreaterMossdog extends CardImpl { public GreaterMossdog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); this.subtype.add(SubType.PLANT); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/g/GuardDogs.java b/Mage.Sets/src/mage/cards/g/GuardDogs.java index 6101684b23..30fe2c42ee 100644 --- a/Mage.Sets/src/mage/cards/g/GuardDogs.java +++ b/Mage.Sets/src/mage/cards/g/GuardDogs.java @@ -30,7 +30,7 @@ public final class GuardDogs extends CardImpl { public GuardDogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/h/HellfireMongrel.java b/Mage.Sets/src/mage/cards/h/HellfireMongrel.java index 125442d401..da1da307dd 100644 --- a/Mage.Sets/src/mage/cards/h/HellfireMongrel.java +++ b/Mage.Sets/src/mage/cards/h/HellfireMongrel.java @@ -25,7 +25,7 @@ public final class HellfireMongrel extends CardImpl { public HellfireMongrel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/h/HollowDogs.java b/Mage.Sets/src/mage/cards/h/HollowDogs.java index 16f4eaa5e7..b2daa9ed90 100644 --- a/Mage.Sets/src/mage/cards/h/HollowDogs.java +++ b/Mage.Sets/src/mage/cards/h/HollowDogs.java @@ -20,7 +20,7 @@ public final class HollowDogs extends CardImpl { public HollowDogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/h/HollowbornBarghest.java b/Mage.Sets/src/mage/cards/h/HollowbornBarghest.java index 21a5fe789f..3e8991c95e 100644 --- a/Mage.Sets/src/mage/cards/h/HollowbornBarghest.java +++ b/Mage.Sets/src/mage/cards/h/HollowbornBarghest.java @@ -36,7 +36,7 @@ public final class HollowbornBarghest extends CardImpl { public HollowbornBarghest(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{B}{B}"); this.subtype.add(SubType.DEMON); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(7); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/h/HoundOfGriselbrand.java b/Mage.Sets/src/mage/cards/h/HoundOfGriselbrand.java index 938d482164..50a3b66a2a 100644 --- a/Mage.Sets/src/mage/cards/h/HoundOfGriselbrand.java +++ b/Mage.Sets/src/mage/cards/h/HoundOfGriselbrand.java @@ -19,7 +19,7 @@ public final class HoundOfGriselbrand extends CardImpl { public HoundOfGriselbrand(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java b/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java index 9206adf00f..3af2670f03 100644 --- a/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java +++ b/Mage.Sets/src/mage/cards/h/HoundOfTheFarbogs.java @@ -28,7 +28,7 @@ public final class HoundOfTheFarbogs extends CardImpl { public HoundOfTheFarbogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(5); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/h/Hydradoodle.java b/Mage.Sets/src/mage/cards/h/Hydradoodle.java index 75fc85bff8..9ab48ab269 100644 --- a/Mage.Sets/src/mage/cards/h/Hydradoodle.java +++ b/Mage.Sets/src/mage/cards/h/Hydradoodle.java @@ -32,7 +32,7 @@ public final class Hydradoodle extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{X}{X}{G}{G}"); this.subtype.add(SubType.HYDRA); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(0); this.toughness = new MageInt(0); diff --git a/Mage.Sets/src/mage/cards/i/ImmolatingSouleater.java b/Mage.Sets/src/mage/cards/i/ImmolatingSouleater.java index bbeb302609..02445eb06b 100644 --- a/Mage.Sets/src/mage/cards/i/ImmolatingSouleater.java +++ b/Mage.Sets/src/mage/cards/i/ImmolatingSouleater.java @@ -22,7 +22,7 @@ public final class ImmolatingSouleater extends CardImpl { public ImmolatingSouleater(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{2}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/i/IsamaruHoundOfKonda.java b/Mage.Sets/src/mage/cards/i/IsamaruHoundOfKonda.java index 35296f3e40..4c7eb1b336 100644 --- a/Mage.Sets/src/mage/cards/i/IsamaruHoundOfKonda.java +++ b/Mage.Sets/src/mage/cards/i/IsamaruHoundOfKonda.java @@ -19,7 +19,7 @@ public final class IsamaruHoundOfKonda extends CardImpl { public IsamaruHoundOfKonda(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/k/KarplusanHound.java b/Mage.Sets/src/mage/cards/k/KarplusanHound.java index 1d0077baa7..62149c4f00 100644 --- a/Mage.Sets/src/mage/cards/k/KarplusanHound.java +++ b/Mage.Sets/src/mage/cards/k/KarplusanHound.java @@ -24,7 +24,7 @@ public final class KarplusanHound extends CardImpl { public KarplusanHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); FilterPlaneswalkerPermanent filter = new FilterPlaneswalkerPermanent("a Chandra planeswalker"); diff --git a/Mage.Sets/src/mage/cards/k/KunorosHoundOfAthreos.java b/Mage.Sets/src/mage/cards/k/KunorosHoundOfAthreos.java index fe8e6d8b15..f6eddc8ae6 100644 --- a/Mage.Sets/src/mage/cards/k/KunorosHoundOfAthreos.java +++ b/Mage.Sets/src/mage/cards/k/KunorosHoundOfAthreos.java @@ -26,7 +26,7 @@ public final class KunorosHoundOfAthreos extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}{B}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LavaHounds.java b/Mage.Sets/src/mage/cards/l/LavaHounds.java index 6e62d95e67..b7b481c90f 100644 --- a/Mage.Sets/src/mage/cards/l/LavaHounds.java +++ b/Mage.Sets/src/mage/cards/l/LavaHounds.java @@ -19,7 +19,7 @@ public final class LavaHounds extends CardImpl { public LavaHounds(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/l/Leashling.java b/Mage.Sets/src/mage/cards/l/Leashling.java index 41f2099042..c4dfc5cd1e 100644 --- a/Mage.Sets/src/mage/cards/l/Leashling.java +++ b/Mage.Sets/src/mage/cards/l/Leashling.java @@ -28,7 +28,7 @@ public final class Leashling extends CardImpl { public Leashling(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT,CardType.CREATURE},"{6}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LightningHounds.java b/Mage.Sets/src/mage/cards/l/LightningHounds.java index 4aba0b130e..36ed3340f5 100644 --- a/Mage.Sets/src/mage/cards/l/LightningHounds.java +++ b/Mage.Sets/src/mage/cards/l/LightningHounds.java @@ -17,7 +17,7 @@ public final class LightningHounds extends CardImpl { public LightningHounds(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/l/LongshotSquad.java b/Mage.Sets/src/mage/cards/l/LongshotSquad.java index 42676ccb5b..21f05d8648 100644 --- a/Mage.Sets/src/mage/cards/l/LongshotSquad.java +++ b/Mage.Sets/src/mage/cards/l/LongshotSquad.java @@ -35,7 +35,7 @@ public final class LongshotSquad extends CardImpl { public LongshotSquad(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.ARCHER); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/l/LurkingJackals.java b/Mage.Sets/src/mage/cards/l/LurkingJackals.java index 4e292aad81..b46ee2691a 100644 --- a/Mage.Sets/src/mage/cards/l/LurkingJackals.java +++ b/Mage.Sets/src/mage/cards/l/LurkingJackals.java @@ -110,7 +110,7 @@ class LurkingJackalsToken extends TokenImpl { public LurkingJackalsToken() { super("Hound", "3/2 Hound creature"); cardType.add(CardType.CREATURE); - subtype.add(SubType.HOUND); + subtype.add(SubType.DOG); power = new MageInt(3); toughness = new MageInt(2); } diff --git a/Mage.Sets/src/mage/cards/m/MadDog.java b/Mage.Sets/src/mage/cards/m/MadDog.java index 17254366cd..797f4cf6c3 100644 --- a/Mage.Sets/src/mage/cards/m/MadDog.java +++ b/Mage.Sets/src/mage/cards/m/MadDog.java @@ -30,7 +30,7 @@ public final class MadDog extends CardImpl { public MadDog(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MogissWarhound.java b/Mage.Sets/src/mage/cards/m/MogissWarhound.java index 3ac5c7cc25..76b79af5e0 100644 --- a/Mage.Sets/src/mage/cards/m/MogissWarhound.java +++ b/Mage.Sets/src/mage/cards/m/MogissWarhound.java @@ -26,7 +26,7 @@ public final class MogissWarhound extends CardImpl { public MogissWarhound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT, CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/MongrelPack.java b/Mage.Sets/src/mage/cards/m/MongrelPack.java index e2a0f56e40..732f0c97ac 100644 --- a/Mage.Sets/src/mage/cards/m/MongrelPack.java +++ b/Mage.Sets/src/mage/cards/m/MongrelPack.java @@ -1,7 +1,5 @@ - package mage.cards.m; -import java.util.UUID; import mage.MageInt; import mage.abilities.common.ZoneChangeTriggeredAbility; import mage.abilities.effects.common.CreateTokenEffect; @@ -13,18 +11,18 @@ import mage.constants.TurnPhase; import mage.constants.Zone; import mage.game.Game; import mage.game.events.GameEvent; -import mage.game.permanent.token.TokenImpl; -import mage.game.permanent.token.Token; +import mage.game.permanent.token.DogToken; + +import java.util.UUID; /** - * * @author North */ public final class MongrelPack extends CardImpl { public MongrelPack(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add(SubType.HOUND); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); + this.subtype.add(SubType.DOG); this.power = new MageInt(4); this.toughness = new MageInt(1); @@ -33,7 +31,7 @@ public final class MongrelPack extends CardImpl { this.addAbility(new MongrelPackAbility()); } - public MongrelPack(final MongrelPack card) { + private MongrelPack(final MongrelPack card) { super(card); } @@ -45,11 +43,11 @@ public final class MongrelPack extends CardImpl { class MongrelPackAbility extends ZoneChangeTriggeredAbility { - public MongrelPackAbility() { - super(Zone.BATTLEFIELD, Zone.GRAVEYARD, new CreateTokenEffect(new HoundToken(), 4), "When {this} dies during combat, ", false); + MongrelPackAbility() { + super(Zone.BATTLEFIELD, Zone.GRAVEYARD, new CreateTokenEffect(new DogToken(), 4), "When {this} dies during combat, ", false); } - public MongrelPackAbility(MongrelPackAbility ability) { + private MongrelPackAbility(MongrelPackAbility ability) { super(ability); } @@ -68,24 +66,3 @@ class MongrelPackAbility extends ZoneChangeTriggeredAbility { return false; } } - -class HoundToken extends TokenImpl { - - public HoundToken() { - super("Hound", "1/1 green Hound creature token"); - cardType.add(CardType.CREATURE); - subtype.add(SubType.HOUND); - - color.setGreen(true); - power = new MageInt(1); - toughness = new MageInt(1); - } - - public HoundToken(final HoundToken token) { - super(token); - } - - public HoundToken copy() { - return new HoundToken(this); - } -} diff --git a/Mage.Sets/src/mage/cards/m/MonstrousHound.java b/Mage.Sets/src/mage/cards/m/MonstrousHound.java index cdebb8caa7..1eba97be67 100644 --- a/Mage.Sets/src/mage/cards/m/MonstrousHound.java +++ b/Mage.Sets/src/mage/cards/m/MonstrousHound.java @@ -26,7 +26,7 @@ public final class MonstrousHound extends CardImpl { public MonstrousHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(4); this.toughness = new MageInt(4); diff --git a/Mage.Sets/src/mage/cards/m/MoonEatingDog.java b/Mage.Sets/src/mage/cards/m/MoonEatingDog.java index 1467030f59..d5d2a004f1 100644 --- a/Mage.Sets/src/mage/cards/m/MoonEatingDog.java +++ b/Mage.Sets/src/mage/cards/m/MoonEatingDog.java @@ -30,7 +30,7 @@ public final class MoonEatingDog extends CardImpl { public MoonEatingDog(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{U}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/m/MortisDogs.java b/Mage.Sets/src/mage/cards/m/MortisDogs.java index 310a8b8867..2f138d7819 100644 --- a/Mage.Sets/src/mage/cards/m/MortisDogs.java +++ b/Mage.Sets/src/mage/cards/m/MortisDogs.java @@ -24,7 +24,7 @@ public final class MortisDogs extends CardImpl { public MortisDogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/m/Mossdog.java b/Mage.Sets/src/mage/cards/m/Mossdog.java index 6f3bff2827..b052767d07 100644 --- a/Mage.Sets/src/mage/cards/m/Mossdog.java +++ b/Mage.Sets/src/mage/cards/m/Mossdog.java @@ -24,7 +24,7 @@ public final class Mossdog extends CardImpl { public Mossdog(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{G}"); this.subtype.add(SubType.PLANT); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/m/MowuLoyalCompanion.java b/Mage.Sets/src/mage/cards/m/MowuLoyalCompanion.java index 946b515178..03ec484dcc 100644 --- a/Mage.Sets/src/mage/cards/m/MowuLoyalCompanion.java +++ b/Mage.Sets/src/mage/cards/m/MowuLoyalCompanion.java @@ -25,7 +25,7 @@ public final class MowuLoyalCompanion extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}"); this.addSuperType(SuperType.LEGENDARY); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/p/PackMastiff.java b/Mage.Sets/src/mage/cards/p/PackMastiff.java index 92a049678b..92413d6e2c 100644 --- a/Mage.Sets/src/mage/cards/p/PackMastiff.java +++ b/Mage.Sets/src/mage/cards/p/PackMastiff.java @@ -28,7 +28,7 @@ public final class PackMastiff extends CardImpl { public PackMastiff(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java b/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java index c0b8a7ce63..f7abe82234 100644 --- a/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java +++ b/Mage.Sets/src/mage/cards/p/PakoArcaneRetriever.java @@ -29,7 +29,7 @@ public final class PakoArcaneRetriever extends CardImpl { this.addSuperType(SuperType.LEGENDARY); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/p/PatrolHound.java b/Mage.Sets/src/mage/cards/p/PatrolHound.java index aa3c45f9ee..266ba9535a 100644 --- a/Mage.Sets/src/mage/cards/p/PatrolHound.java +++ b/Mage.Sets/src/mage/cards/p/PatrolHound.java @@ -22,7 +22,7 @@ public final class PatrolHound extends CardImpl { public PatrolHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PhantomWhelp.java b/Mage.Sets/src/mage/cards/p/PhantomWhelp.java index 33d2e7e760..f397cf302a 100644 --- a/Mage.Sets/src/mage/cards/p/PhantomWhelp.java +++ b/Mage.Sets/src/mage/cards/p/PhantomWhelp.java @@ -22,7 +22,7 @@ public final class PhantomWhelp extends CardImpl { public PhantomWhelp(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}"); this.subtype.add(SubType.ILLUSION); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/p/PlagueDogs.java b/Mage.Sets/src/mage/cards/p/PlagueDogs.java index 9eda0693bc..4982b29055 100644 --- a/Mage.Sets/src/mage/cards/p/PlagueDogs.java +++ b/Mage.Sets/src/mage/cards/p/PlagueDogs.java @@ -26,7 +26,7 @@ public final class PlagueDogs extends CardImpl { public PlagueDogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/p/PyreHound.java b/Mage.Sets/src/mage/cards/p/PyreHound.java index 6e42ee1b4c..4a17383d6d 100644 --- a/Mage.Sets/src/mage/cards/p/PyreHound.java +++ b/Mage.Sets/src/mage/cards/p/PyreHound.java @@ -22,7 +22,7 @@ public final class PyreHound extends CardImpl { public PyreHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/RakdosRagemutt.java b/Mage.Sets/src/mage/cards/r/RakdosRagemutt.java index e4c1a606b2..90171b0a0c 100644 --- a/Mage.Sets/src/mage/cards/r/RakdosRagemutt.java +++ b/Mage.Sets/src/mage/cards/r/RakdosRagemutt.java @@ -19,7 +19,7 @@ public final class RakdosRagemutt extends CardImpl { public RakdosRagemutt(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/r/ResoluteWatchdog.java b/Mage.Sets/src/mage/cards/r/ResoluteWatchdog.java index 80f127f700..2376752bd1 100644 --- a/Mage.Sets/src/mage/cards/r/ResoluteWatchdog.java +++ b/Mage.Sets/src/mage/cards/r/ResoluteWatchdog.java @@ -25,7 +25,7 @@ public final class ResoluteWatchdog extends CardImpl { public ResoluteWatchdog(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java index 3329be2819..95f4f69c7e 100644 --- a/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java +++ b/Mage.Sets/src/mage/cards/s/SaltRoadAmbushers.java @@ -23,7 +23,7 @@ public final class SaltRoadAmbushers extends CardImpl { public SaltRoadAmbushers(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.WARRIOR); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SandsteppeScavenger.java b/Mage.Sets/src/mage/cards/s/SandsteppeScavenger.java index 770fa83768..d23385995d 100644 --- a/Mage.Sets/src/mage/cards/s/SandsteppeScavenger.java +++ b/Mage.Sets/src/mage/cards/s/SandsteppeScavenger.java @@ -18,7 +18,7 @@ public final class SandsteppeScavenger extends CardImpl { public SandsteppeScavenger(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.subtype.add(SubType.SCOUT); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java b/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java index dc4727c640..412f2bf00f 100644 --- a/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java +++ b/Mage.Sets/src/mage/cards/s/ScrapyardMongrel.java @@ -26,7 +26,7 @@ public final class ScrapyardMongrel extends CardImpl { public ScrapyardMongrel(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.color.setRed(true); this.power = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/s/SnowHound.java b/Mage.Sets/src/mage/cards/s/SnowHound.java index e671b45802..1b9e1212b5 100644 --- a/Mage.Sets/src/mage/cards/s/SnowHound.java +++ b/Mage.Sets/src/mage/cards/s/SnowHound.java @@ -35,7 +35,7 @@ public final class SnowHound extends CardImpl { public SnowHound(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java b/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java index 7460f5d5a2..a2a07b2283 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenFoulbloods.java @@ -26,7 +26,7 @@ public final class ThrabenFoulbloods extends CardImpl { public ThrabenFoulbloods(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.subtype.add(SubType.ZOMBIE); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/t/ThrabenPurebloods.java b/Mage.Sets/src/mage/cards/t/ThrabenPurebloods.java index ecc9344de7..e5c7d92fb6 100644 --- a/Mage.Sets/src/mage/cards/t/ThrabenPurebloods.java +++ b/Mage.Sets/src/mage/cards/t/ThrabenPurebloods.java @@ -16,7 +16,7 @@ public final class ThrabenPurebloods extends CardImpl { public ThrabenPurebloods(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(5); diff --git a/Mage.Sets/src/mage/cards/t/ThrashingMossdog.java b/Mage.Sets/src/mage/cards/t/ThrashingMossdog.java index d3a8501c73..c107bab3a1 100644 --- a/Mage.Sets/src/mage/cards/t/ThrashingMossdog.java +++ b/Mage.Sets/src/mage/cards/t/ThrashingMossdog.java @@ -23,7 +23,7 @@ public final class ThrashingMossdog extends CardImpl { public ThrashingMossdog (UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}"); this.subtype.add(SubType.PLANT); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/t/TwoHeadedCerberus.java b/Mage.Sets/src/mage/cards/t/TwoHeadedCerberus.java index 495ca8c029..476abb0bce 100644 --- a/Mage.Sets/src/mage/cards/t/TwoHeadedCerberus.java +++ b/Mage.Sets/src/mage/cards/t/TwoHeadedCerberus.java @@ -17,7 +17,7 @@ public final class TwoHeadedCerberus extends CardImpl { public TwoHeadedCerberus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{R}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java index 85bed3bdbc..85f0a72e52 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldCerberus.java @@ -25,7 +25,7 @@ public final class UnderworldCerberus extends CardImpl { public UnderworldCerberus(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(6); this.toughness = new MageInt(6); diff --git a/Mage.Sets/src/mage/cards/u/UnderworldRageHound.java b/Mage.Sets/src/mage/cards/u/UnderworldRageHound.java index ee3ee87feb..0040b79403 100644 --- a/Mage.Sets/src/mage/cards/u/UnderworldRageHound.java +++ b/Mage.Sets/src/mage/cards/u/UnderworldRageHound.java @@ -20,7 +20,7 @@ public final class UnderworldRageHound extends CardImpl { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{R}"); this.subtype.add(SubType.ELEMENTAL); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(3); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/v/VampireHounds.java b/Mage.Sets/src/mage/cards/v/VampireHounds.java index f231c28a65..7cfaeabfd4 100644 --- a/Mage.Sets/src/mage/cards/v/VampireHounds.java +++ b/Mage.Sets/src/mage/cards/v/VampireHounds.java @@ -23,7 +23,7 @@ public final class VampireHounds extends CardImpl { public VampireHounds(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}"); this.subtype.add(SubType.VAMPIRE); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/w/WarclampMastiff.java b/Mage.Sets/src/mage/cards/w/WarclampMastiff.java index 80478a69b6..1235a7b540 100644 --- a/Mage.Sets/src/mage/cards/w/WarclampMastiff.java +++ b/Mage.Sets/src/mage/cards/w/WarclampMastiff.java @@ -17,7 +17,7 @@ public final class WarclampMastiff extends CardImpl { public WarclampMastiff(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/w/Watchdog.java b/Mage.Sets/src/mage/cards/w/Watchdog.java index f2fe75c581..e3abcaf92c 100644 --- a/Mage.Sets/src/mage/cards/w/Watchdog.java +++ b/Mage.Sets/src/mage/cards/w/Watchdog.java @@ -28,7 +28,7 @@ public final class Watchdog extends CardImpl { public Watchdog(UUID ownerId, CardSetInfo setInfo) { super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(1); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/w/WildDogs.java b/Mage.Sets/src/mage/cards/w/WildDogs.java index 6d5b91cd19..58202239c7 100644 --- a/Mage.Sets/src/mage/cards/w/WildDogs.java +++ b/Mage.Sets/src/mage/cards/w/WildDogs.java @@ -30,7 +30,7 @@ public final class WildDogs extends CardImpl { public WildDogs(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(1); diff --git a/Mage.Sets/src/mage/cards/w/WildMongrel.java b/Mage.Sets/src/mage/cards/w/WildMongrel.java index 861fc78d4c..004c7b44fa 100644 --- a/Mage.Sets/src/mage/cards/w/WildMongrel.java +++ b/Mage.Sets/src/mage/cards/w/WildMongrel.java @@ -24,7 +24,7 @@ public final class WildMongrel extends CardImpl { public WildMongrel(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Sets/src/mage/cards/w/WildfireCerberus.java b/Mage.Sets/src/mage/cards/w/WildfireCerberus.java index 33bedaa6ae..109b94a19a 100644 --- a/Mage.Sets/src/mage/cards/w/WildfireCerberus.java +++ b/Mage.Sets/src/mage/cards/w/WildfireCerberus.java @@ -30,7 +30,7 @@ public final class WildfireCerberus extends CardImpl { public WildfireCerberus(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(4); this.toughness = new MageInt(3); diff --git a/Mage.Sets/src/mage/cards/z/ZodiacDog.java b/Mage.Sets/src/mage/cards/z/ZodiacDog.java index 9fb27e6f9b..d0e42b72b4 100644 --- a/Mage.Sets/src/mage/cards/z/ZodiacDog.java +++ b/Mage.Sets/src/mage/cards/z/ZodiacDog.java @@ -17,7 +17,7 @@ public final class ZodiacDog extends CardImpl { public ZodiacDog(UUID ownerId, CardSetInfo setInfo) { super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}"); - this.subtype.add(SubType.HOUND); + this.subtype.add(SubType.DOG); this.power = new MageInt(2); this.toughness = new MageInt(2); diff --git a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java index 23adfada9f..8e32f24aec 100644 --- a/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java +++ b/Mage.Verify/src/test/java/mage/verify/VerifyCardDataTest.java @@ -117,6 +117,9 @@ public class VerifyCardDataTest { // subtype skipListCreate(SKIP_LIST_SUBTYPE); skipListAddName(SKIP_LIST_SUBTYPE, "UGL", "Miss Demeanor"); + // the following is temporary + subtypesToIgnore.add("Dog"); + subtypesToIgnore.add("Hound"); // number skipListCreate(SKIP_LIST_NUMBER); diff --git a/Mage/src/main/java/mage/constants/SubType.java b/Mage/src/main/java/mage/constants/SubType.java index d9a0ad83b0..7f0c89242f 100644 --- a/Mage/src/main/java/mage/constants/SubType.java +++ b/Mage/src/main/java/mage/constants/SubType.java @@ -119,6 +119,7 @@ public enum SubType { DEVIL("Devil", SubTypeSet.CreatureType), DINOSAUR("Dinosaur", SubTypeSet.CreatureType), // With Ixalan now being spoiled, need this to be selectable DJINN("Djinn", SubTypeSet.CreatureType), + DOG("Dog", SubTypeSet.CreatureType), DRAGON("Dragon", SubTypeSet.CreatureType), DRAKE("Drake", SubTypeSet.CreatureType), DREADNOUGHT("Dreadnought", SubTypeSet.CreatureType), @@ -175,7 +176,6 @@ public enum SubType { HOMUNCULUS("Homunculus", SubTypeSet.CreatureType), HORROR("Horror", SubTypeSet.CreatureType), HORSE("Horse", SubTypeSet.CreatureType), - HOUND("Hound", SubTypeSet.CreatureType), HUMAN("Human", SubTypeSet.CreatureType), HUNTER("Hunter", SubTypeSet.CreatureType), HUTT("Hutt", SubTypeSet.CreatureType, true), // Star Wars diff --git a/Mage/src/main/java/mage/game/permanent/token/HoundToken.java b/Mage/src/main/java/mage/game/permanent/token/DogToken.java similarity index 53% rename from Mage/src/main/java/mage/game/permanent/token/HoundToken.java rename to Mage/src/main/java/mage/game/permanent/token/DogToken.java index a20c160fc1..a229350513 100644 --- a/Mage/src/main/java/mage/game/permanent/token/HoundToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/DogToken.java @@ -1,31 +1,29 @@ - - package mage.game.permanent.token; + +import mage.MageInt; import mage.constants.CardType; import mage.constants.SubType; -import mage.MageInt; /** - * * @author spjspj */ -public final class HoundToken extends TokenImpl { +public final class DogToken extends TokenImpl { - public HoundToken() { - super("Hound", "1/1 green Hound creature token"); + public DogToken() { + super("Dog", "1/1 green Dog creature token"); cardType.add(CardType.CREATURE); - subtype.add(SubType.HOUND); + subtype.add(SubType.DOG); color.setGreen(true); power = new MageInt(1); toughness = new MageInt(1); } - public HoundToken(final HoundToken token) { + private DogToken(final DogToken token) { super(token); } - public HoundToken copy() { - return new HoundToken(this); + public DogToken copy() { + return new DogToken(this); } } diff --git a/Mage/src/main/java/mage/game/permanent/token/MowuToken.java b/Mage/src/main/java/mage/game/permanent/token/MowuToken.java index 7312106610..5d38df4ce0 100644 --- a/Mage/src/main/java/mage/game/permanent/token/MowuToken.java +++ b/Mage/src/main/java/mage/game/permanent/token/MowuToken.java @@ -1,4 +1,3 @@ - package mage.game.permanent.token; import mage.MageInt; @@ -13,11 +12,11 @@ import mage.constants.SuperType; public final class MowuToken extends TokenImpl { public MowuToken() { - super("Mowu", "legendary 3/3 green Hound creature token named Mowu"); + super("Mowu", "legendary 3/3 green Dog creature token named Mowu"); cardType.add(CardType.CREATURE); color.setGreen(true); this.addSuperType(SuperType.LEGENDARY); - subtype.add(SubType.HOUND); + subtype.add(SubType.DOG); power = new MageInt(3); toughness = new MageInt(3); }