From 5f32fe53085d39602d9cf0a799ab7ac11f656bdb Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Sun, 12 Sep 2021 18:06:46 -0400 Subject: [PATCH] [MID] changed daybound/nightbound from being singleton --- .../src/mage/cards/a/ArlinnTheMoonsFury.java | 2 +- .../src/mage/cards/a/ArlinnThePacksHope.java | 2 +- Mage.Sets/src/mage/cards/b/BirdAdmirer.java | 2 +- Mage.Sets/src/mage/cards/b/BrutalCathar.java | 2 +- Mage.Sets/src/mage/cards/b/BurlyBreaker.java | 2 +- .../src/mage/cards/d/DireStrainBrawler.java | 2 +- .../mage/cards/d/DireStrainDemolisher.java | 2 +- .../src/mage/cards/f/FangbladeBrigand.java | 2 +- .../mage/cards/f/FangbladeEviscerator.java | 2 +- .../src/mage/cards/f/FrenziedTrapbreaker.java | 2 +- .../src/mage/cards/g/GraveyardGlutton.java | 2 +- .../src/mage/cards/g/GraveyardTrespasser.java | 2 +- .../mage/cards/h/HarvesttideAssailant.java | 2 +- .../mage/cards/h/HarvesttideInfiltrator.java | 2 +- Mage.Sets/src/mage/cards/h/HoundTamer.java | 2 +- .../src/mage/cards/k/KessigNaturalist.java | 2 +- .../src/mage/cards/l/LordOfTheUlvenwald.java | 2 +- Mage.Sets/src/mage/cards/m/MoonrageBrute.java | 2 +- .../src/mage/cards/o/OutlandLiberator.java | 2 +- .../src/mage/cards/r/RecklessStormseeker.java | 2 +- .../src/mage/cards/s/SeafaringWerewolf.java | 2 +- Mage.Sets/src/mage/cards/s/ShadyTraveler.java | 2 +- .../src/mage/cards/s/SpellruneHowler.java | 2 +- .../src/mage/cards/s/SpellrunePainter.java | 2 +- .../src/mage/cards/s/StalkingPredator.java | 2 +- .../src/mage/cards/s/StormChargedSlasher.java | 2 +- .../src/mage/cards/s/SuspiciousStowaway.java | 2 +- Mage.Sets/src/mage/cards/t/TavernRuffian.java | 2 +- Mage.Sets/src/mage/cards/t/TavernSmasher.java | 2 +- .../src/mage/cards/t/TirelessHauler.java | 2 +- .../src/mage/cards/t/TovolarsHuntmaster.java | 2 +- .../src/mage/cards/t/TovolarsPackleader.java | 2 +- Mage.Sets/src/mage/cards/u/UntamedPup.java | 2 +- .../src/mage/cards/v/VillageReavers.java | 2 +- Mage.Sets/src/mage/cards/v/VillageWatch.java | 2 +- Mage.Sets/src/mage/cards/w/WingShredder.java | 2 +- .../abilities/keyword/DayboundAbility.java | 26 +++++-------------- .../abilities/keyword/NightboundAbility.java | 26 +++++-------------- Utils/keywords.txt | 4 +-- 39 files changed, 50 insertions(+), 78 deletions(-) diff --git a/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java b/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java index 96a462e0f81..98e064a041b 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnTheMoonsFury.java @@ -35,7 +35,7 @@ public final class ArlinnTheMoonsFury extends CardImpl { this.nightCard = true; // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); // +2: Add {R}{G}. this.addAbility(new LoyaltyAbility(new BasicManaEffect(new Mana( diff --git a/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java b/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java index 39076e1d213..ee4f826916a 100644 --- a/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java +++ b/Mage.Sets/src/mage/cards/a/ArlinnThePacksHope.java @@ -40,7 +40,7 @@ public final class ArlinnThePacksHope extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); // +1: Until your next turn, you may cast creature spells as though they had flash, and each creature you control enters the battlefield with an additional +1/+1 counter on it. Ability ability = new LoyaltyAbility(new CastAsThoughItHadFlashAllEffect( diff --git a/Mage.Sets/src/mage/cards/b/BirdAdmirer.java b/Mage.Sets/src/mage/cards/b/BirdAdmirer.java index 23cd8f80e6c..3ee4bc0bd70 100644 --- a/Mage.Sets/src/mage/cards/b/BirdAdmirer.java +++ b/Mage.Sets/src/mage/cards/b/BirdAdmirer.java @@ -32,7 +32,7 @@ public final class BirdAdmirer extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private BirdAdmirer(final BirdAdmirer card) { diff --git a/Mage.Sets/src/mage/cards/b/BrutalCathar.java b/Mage.Sets/src/mage/cards/b/BrutalCathar.java index 1640c63563a..902e0277d02 100644 --- a/Mage.Sets/src/mage/cards/b/BrutalCathar.java +++ b/Mage.Sets/src/mage/cards/b/BrutalCathar.java @@ -40,7 +40,7 @@ public final class BrutalCathar extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private BrutalCathar(final BrutalCathar card) { diff --git a/Mage.Sets/src/mage/cards/b/BurlyBreaker.java b/Mage.Sets/src/mage/cards/b/BurlyBreaker.java index e81de9308fb..4f327728240 100644 --- a/Mage.Sets/src/mage/cards/b/BurlyBreaker.java +++ b/Mage.Sets/src/mage/cards/b/BurlyBreaker.java @@ -32,7 +32,7 @@ public final class BurlyBreaker extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private BurlyBreaker(final BurlyBreaker card) { diff --git a/Mage.Sets/src/mage/cards/d/DireStrainBrawler.java b/Mage.Sets/src/mage/cards/d/DireStrainBrawler.java index f6d61205137..c7116d20e7f 100644 --- a/Mage.Sets/src/mage/cards/d/DireStrainBrawler.java +++ b/Mage.Sets/src/mage/cards/d/DireStrainBrawler.java @@ -29,7 +29,7 @@ public final class DireStrainBrawler extends CardImpl { this.addAbility(VigilanceAbility.getInstance()); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private DireStrainBrawler(final DireStrainBrawler card) { diff --git a/Mage.Sets/src/mage/cards/d/DireStrainDemolisher.java b/Mage.Sets/src/mage/cards/d/DireStrainDemolisher.java index 40ee7cbd748..51fcdcc7077 100644 --- a/Mage.Sets/src/mage/cards/d/DireStrainDemolisher.java +++ b/Mage.Sets/src/mage/cards/d/DireStrainDemolisher.java @@ -30,7 +30,7 @@ public final class DireStrainDemolisher extends CardImpl { this.addAbility(new WardAbility(new ManaCostsImpl<>("{3}"))); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private DireStrainDemolisher(final DireStrainDemolisher card) { diff --git a/Mage.Sets/src/mage/cards/f/FangbladeBrigand.java b/Mage.Sets/src/mage/cards/f/FangbladeBrigand.java index 67526dfe671..c8bab4a3313 100644 --- a/Mage.Sets/src/mage/cards/f/FangbladeBrigand.java +++ b/Mage.Sets/src/mage/cards/f/FangbladeBrigand.java @@ -43,7 +43,7 @@ public final class FangbladeBrigand extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private FangbladeBrigand(final FangbladeBrigand card) { diff --git a/Mage.Sets/src/mage/cards/f/FangbladeEviscerator.java b/Mage.Sets/src/mage/cards/f/FangbladeEviscerator.java index 2bf456d84b0..f3a9ba0926a 100644 --- a/Mage.Sets/src/mage/cards/f/FangbladeEviscerator.java +++ b/Mage.Sets/src/mage/cards/f/FangbladeEviscerator.java @@ -47,7 +47,7 @@ public final class FangbladeEviscerator extends CardImpl { ), new ManaCostsImpl<>("{4}{R}"))); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private FangbladeEviscerator(final FangbladeEviscerator card) { diff --git a/Mage.Sets/src/mage/cards/f/FrenziedTrapbreaker.java b/Mage.Sets/src/mage/cards/f/FrenziedTrapbreaker.java index 9dbe001be71..3eaf2dae55e 100644 --- a/Mage.Sets/src/mage/cards/f/FrenziedTrapbreaker.java +++ b/Mage.Sets/src/mage/cards/f/FrenziedTrapbreaker.java @@ -52,7 +52,7 @@ public final class FrenziedTrapbreaker extends CardImpl { this.addAbility(ability); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private FrenziedTrapbreaker(final FrenziedTrapbreaker card) { diff --git a/Mage.Sets/src/mage/cards/g/GraveyardGlutton.java b/Mage.Sets/src/mage/cards/g/GraveyardGlutton.java index 9e700d816c4..8cd92dd191b 100644 --- a/Mage.Sets/src/mage/cards/g/GraveyardGlutton.java +++ b/Mage.Sets/src/mage/cards/g/GraveyardGlutton.java @@ -46,7 +46,7 @@ public final class GraveyardGlutton extends CardImpl { this.addAbility(ability); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private GraveyardGlutton(final GraveyardGlutton card) { diff --git a/Mage.Sets/src/mage/cards/g/GraveyardTrespasser.java b/Mage.Sets/src/mage/cards/g/GraveyardTrespasser.java index f74e5125d35..4b505e9d417 100644 --- a/Mage.Sets/src/mage/cards/g/GraveyardTrespasser.java +++ b/Mage.Sets/src/mage/cards/g/GraveyardTrespasser.java @@ -48,7 +48,7 @@ public final class GraveyardTrespasser extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private GraveyardTrespasser(final GraveyardTrespasser card) { diff --git a/Mage.Sets/src/mage/cards/h/HarvesttideAssailant.java b/Mage.Sets/src/mage/cards/h/HarvesttideAssailant.java index 4c888f9ad8f..55c37c19d41 100644 --- a/Mage.Sets/src/mage/cards/h/HarvesttideAssailant.java +++ b/Mage.Sets/src/mage/cards/h/HarvesttideAssailant.java @@ -29,7 +29,7 @@ public final class HarvesttideAssailant extends CardImpl { this.addAbility(TrampleAbility.getInstance()); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private HarvesttideAssailant(final HarvesttideAssailant card) { diff --git a/Mage.Sets/src/mage/cards/h/HarvesttideInfiltrator.java b/Mage.Sets/src/mage/cards/h/HarvesttideInfiltrator.java index aff3c87fa60..66e8715dc57 100644 --- a/Mage.Sets/src/mage/cards/h/HarvesttideInfiltrator.java +++ b/Mage.Sets/src/mage/cards/h/HarvesttideInfiltrator.java @@ -31,7 +31,7 @@ public final class HarvesttideInfiltrator extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private HarvesttideInfiltrator(final HarvesttideInfiltrator card) { diff --git a/Mage.Sets/src/mage/cards/h/HoundTamer.java b/Mage.Sets/src/mage/cards/h/HoundTamer.java index 02d1b4f3cbb..d45833ecbd5 100644 --- a/Mage.Sets/src/mage/cards/h/HoundTamer.java +++ b/Mage.Sets/src/mage/cards/h/HoundTamer.java @@ -44,7 +44,7 @@ public final class HoundTamer extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private HoundTamer(final HoundTamer card) { diff --git a/Mage.Sets/src/mage/cards/k/KessigNaturalist.java b/Mage.Sets/src/mage/cards/k/KessigNaturalist.java index c9e52efc30b..bc9096b8f54 100644 --- a/Mage.Sets/src/mage/cards/k/KessigNaturalist.java +++ b/Mage.Sets/src/mage/cards/k/KessigNaturalist.java @@ -38,7 +38,7 @@ public final class KessigNaturalist extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private KessigNaturalist(final KessigNaturalist card) { diff --git a/Mage.Sets/src/mage/cards/l/LordOfTheUlvenwald.java b/Mage.Sets/src/mage/cards/l/LordOfTheUlvenwald.java index 4bd34e1408c..05f56567b31 100644 --- a/Mage.Sets/src/mage/cards/l/LordOfTheUlvenwald.java +++ b/Mage.Sets/src/mage/cards/l/LordOfTheUlvenwald.java @@ -56,7 +56,7 @@ public final class LordOfTheUlvenwald extends CardImpl { this.addAbility(new AttacksTriggeredAbility(new LordOfTheUlvenwaldEffect())); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private LordOfTheUlvenwald(final LordOfTheUlvenwald card) { diff --git a/Mage.Sets/src/mage/cards/m/MoonrageBrute.java b/Mage.Sets/src/mage/cards/m/MoonrageBrute.java index 5df9cb9e93b..bbd90c57b43 100644 --- a/Mage.Sets/src/mage/cards/m/MoonrageBrute.java +++ b/Mage.Sets/src/mage/cards/m/MoonrageBrute.java @@ -34,7 +34,7 @@ public final class MoonrageBrute extends CardImpl { this.addAbility(new WardAbility(new PayLifeCost(3))); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private MoonrageBrute(final MoonrageBrute card) { diff --git a/Mage.Sets/src/mage/cards/o/OutlandLiberator.java b/Mage.Sets/src/mage/cards/o/OutlandLiberator.java index b4a2e9affc0..3e27af77112 100644 --- a/Mage.Sets/src/mage/cards/o/OutlandLiberator.java +++ b/Mage.Sets/src/mage/cards/o/OutlandLiberator.java @@ -37,7 +37,7 @@ public final class OutlandLiberator extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private OutlandLiberator(final OutlandLiberator card) { diff --git a/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java b/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java index da11e7ace7f..8b78f15c067 100644 --- a/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java +++ b/Mage.Sets/src/mage/cards/r/RecklessStormseeker.java @@ -47,7 +47,7 @@ public final class RecklessStormseeker extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private RecklessStormseeker(final RecklessStormseeker card) { diff --git a/Mage.Sets/src/mage/cards/s/SeafaringWerewolf.java b/Mage.Sets/src/mage/cards/s/SeafaringWerewolf.java index f2789e2301d..c075a58ed96 100644 --- a/Mage.Sets/src/mage/cards/s/SeafaringWerewolf.java +++ b/Mage.Sets/src/mage/cards/s/SeafaringWerewolf.java @@ -36,7 +36,7 @@ public final class SeafaringWerewolf extends CardImpl { )); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private SeafaringWerewolf(final SeafaringWerewolf card) { diff --git a/Mage.Sets/src/mage/cards/s/ShadyTraveler.java b/Mage.Sets/src/mage/cards/s/ShadyTraveler.java index e9ab146127b..f2424f30024 100644 --- a/Mage.Sets/src/mage/cards/s/ShadyTraveler.java +++ b/Mage.Sets/src/mage/cards/s/ShadyTraveler.java @@ -31,7 +31,7 @@ public final class ShadyTraveler extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private ShadyTraveler(final ShadyTraveler card) { diff --git a/Mage.Sets/src/mage/cards/s/SpellruneHowler.java b/Mage.Sets/src/mage/cards/s/SpellruneHowler.java index c5c63b6da66..a7419fbe12c 100644 --- a/Mage.Sets/src/mage/cards/s/SpellruneHowler.java +++ b/Mage.Sets/src/mage/cards/s/SpellruneHowler.java @@ -35,7 +35,7 @@ public final class SpellruneHowler extends CardImpl { )); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private SpellruneHowler(final SpellruneHowler card) { diff --git a/Mage.Sets/src/mage/cards/s/SpellrunePainter.java b/Mage.Sets/src/mage/cards/s/SpellrunePainter.java index 3e46dc3ef0b..8a7b20c3458 100644 --- a/Mage.Sets/src/mage/cards/s/SpellrunePainter.java +++ b/Mage.Sets/src/mage/cards/s/SpellrunePainter.java @@ -38,7 +38,7 @@ public final class SpellrunePainter extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private SpellrunePainter(final SpellrunePainter card) { diff --git a/Mage.Sets/src/mage/cards/s/StalkingPredator.java b/Mage.Sets/src/mage/cards/s/StalkingPredator.java index 9721d074f27..98ce16017b5 100644 --- a/Mage.Sets/src/mage/cards/s/StalkingPredator.java +++ b/Mage.Sets/src/mage/cards/s/StalkingPredator.java @@ -29,7 +29,7 @@ public final class StalkingPredator extends CardImpl { this.addAbility(new MenaceAbility()); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private StalkingPredator(final StalkingPredator card) { diff --git a/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java b/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java index 4b0e5f52872..93ba611b364 100644 --- a/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java +++ b/Mage.Sets/src/mage/cards/s/StormChargedSlasher.java @@ -49,7 +49,7 @@ public final class StormChargedSlasher extends CardImpl { this.addAbility(ability); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private StormChargedSlasher(final StormChargedSlasher card) { diff --git a/Mage.Sets/src/mage/cards/s/SuspiciousStowaway.java b/Mage.Sets/src/mage/cards/s/SuspiciousStowaway.java index 8b09363b0cb..83c217f6fc6 100644 --- a/Mage.Sets/src/mage/cards/s/SuspiciousStowaway.java +++ b/Mage.Sets/src/mage/cards/s/SuspiciousStowaway.java @@ -39,7 +39,7 @@ public final class SuspiciousStowaway extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private SuspiciousStowaway(final SuspiciousStowaway card) { diff --git a/Mage.Sets/src/mage/cards/t/TavernRuffian.java b/Mage.Sets/src/mage/cards/t/TavernRuffian.java index fa0f278d608..b06f875bd57 100644 --- a/Mage.Sets/src/mage/cards/t/TavernRuffian.java +++ b/Mage.Sets/src/mage/cards/t/TavernRuffian.java @@ -29,7 +29,7 @@ public final class TavernRuffian extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private TavernRuffian(final TavernRuffian card) { diff --git a/Mage.Sets/src/mage/cards/t/TavernSmasher.java b/Mage.Sets/src/mage/cards/t/TavernSmasher.java index bb399b15cc0..8a3b1258e57 100644 --- a/Mage.Sets/src/mage/cards/t/TavernSmasher.java +++ b/Mage.Sets/src/mage/cards/t/TavernSmasher.java @@ -28,7 +28,7 @@ public final class TavernSmasher extends CardImpl { this.toughness = new MageInt(5); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private TavernSmasher(final TavernSmasher card) { diff --git a/Mage.Sets/src/mage/cards/t/TirelessHauler.java b/Mage.Sets/src/mage/cards/t/TirelessHauler.java index e4603424729..c50d0ac4ca8 100644 --- a/Mage.Sets/src/mage/cards/t/TirelessHauler.java +++ b/Mage.Sets/src/mage/cards/t/TirelessHauler.java @@ -31,7 +31,7 @@ public final class TirelessHauler extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private TirelessHauler(final TirelessHauler card) { diff --git a/Mage.Sets/src/mage/cards/t/TovolarsHuntmaster.java b/Mage.Sets/src/mage/cards/t/TovolarsHuntmaster.java index 40ffabbe628..728ea25305f 100644 --- a/Mage.Sets/src/mage/cards/t/TovolarsHuntmaster.java +++ b/Mage.Sets/src/mage/cards/t/TovolarsHuntmaster.java @@ -33,7 +33,7 @@ public final class TovolarsHuntmaster extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private TovolarsHuntmaster(final TovolarsHuntmaster card) { diff --git a/Mage.Sets/src/mage/cards/t/TovolarsPackleader.java b/Mage.Sets/src/mage/cards/t/TovolarsPackleader.java index b167aff49c2..ce1a3bff2a2 100644 --- a/Mage.Sets/src/mage/cards/t/TovolarsPackleader.java +++ b/Mage.Sets/src/mage/cards/t/TovolarsPackleader.java @@ -61,7 +61,7 @@ public final class TovolarsPackleader extends CardImpl { ability.addTarget(new TargetPermanent(StaticFilters.FILTER_CREATURE_YOU_DONT_CONTROL)); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private TovolarsPackleader(final TovolarsPackleader card) { diff --git a/Mage.Sets/src/mage/cards/u/UntamedPup.java b/Mage.Sets/src/mage/cards/u/UntamedPup.java index 89289789654..519b2ef3353 100644 --- a/Mage.Sets/src/mage/cards/u/UntamedPup.java +++ b/Mage.Sets/src/mage/cards/u/UntamedPup.java @@ -61,7 +61,7 @@ public final class UntamedPup extends CardImpl { this.addAbility(ability); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private UntamedPup(final UntamedPup card) { diff --git a/Mage.Sets/src/mage/cards/v/VillageReavers.java b/Mage.Sets/src/mage/cards/v/VillageReavers.java index 23a0a1ebd73..efa4fe5e3ff 100644 --- a/Mage.Sets/src/mage/cards/v/VillageReavers.java +++ b/Mage.Sets/src/mage/cards/v/VillageReavers.java @@ -49,7 +49,7 @@ public final class VillageReavers extends CardImpl { ))); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private VillageReavers(final VillageReavers card) { diff --git a/Mage.Sets/src/mage/cards/v/VillageWatch.java b/Mage.Sets/src/mage/cards/v/VillageWatch.java index 4641353d28f..c620c73046f 100644 --- a/Mage.Sets/src/mage/cards/v/VillageWatch.java +++ b/Mage.Sets/src/mage/cards/v/VillageWatch.java @@ -32,7 +32,7 @@ public final class VillageWatch extends CardImpl { // Daybound this.addAbility(new TransformAbility()); - this.addAbility(DayboundAbility.getInstance()); + this.addAbility(new DayboundAbility()); } private VillageWatch(final VillageWatch card) { diff --git a/Mage.Sets/src/mage/cards/w/WingShredder.java b/Mage.Sets/src/mage/cards/w/WingShredder.java index 33e792c600a..e1946dd6e5b 100644 --- a/Mage.Sets/src/mage/cards/w/WingShredder.java +++ b/Mage.Sets/src/mage/cards/w/WingShredder.java @@ -30,7 +30,7 @@ public final class WingShredder extends CardImpl { this.addAbility(ReachAbility.getInstance()); // Nightbound - this.addAbility(NightboundAbility.getInstance()); + this.addAbility(new NightboundAbility()); } private WingShredder(final WingShredder card) { diff --git a/Mage/src/main/java/mage/abilities/keyword/DayboundAbility.java b/Mage/src/main/java/mage/abilities/keyword/DayboundAbility.java index 968846cc88c..1e8761d6b4c 100644 --- a/Mage/src/main/java/mage/abilities/keyword/DayboundAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/DayboundAbility.java @@ -1,34 +1,20 @@ package mage.abilities.keyword; -import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; -import java.io.ObjectStreamException; - /** * @author TheElk801 * TODO: Implement this */ -public class DayboundAbility extends StaticAbility implements MageSingleton { +public class DayboundAbility extends StaticAbility { - private static final DayboundAbility instance; - - static { - instance = new DayboundAbility(); - // instance.addIcon(DayboundAbilityIcon.instance); (needs to be added) + public DayboundAbility() { + super(Zone.BATTLEFIELD, null); } - private Object readResolve() throws ObjectStreamException { - return instance; - } - - public static DayboundAbility getInstance() { - return instance; - } - - private DayboundAbility() { - super(Zone.ALL, null); + private DayboundAbility(final DayboundAbility ability) { + super(ability); } @Override @@ -38,6 +24,6 @@ public class DayboundAbility extends StaticAbility implements MageSingleton { @Override public DayboundAbility copy() { - return instance; + return new DayboundAbility(this); } } diff --git a/Mage/src/main/java/mage/abilities/keyword/NightboundAbility.java b/Mage/src/main/java/mage/abilities/keyword/NightboundAbility.java index 13f232d50d8..804b63c83cc 100644 --- a/Mage/src/main/java/mage/abilities/keyword/NightboundAbility.java +++ b/Mage/src/main/java/mage/abilities/keyword/NightboundAbility.java @@ -1,34 +1,20 @@ package mage.abilities.keyword; -import mage.abilities.MageSingleton; import mage.abilities.StaticAbility; import mage.constants.Zone; -import java.io.ObjectStreamException; - /** * @author TheElk801 * TODO: Implement this */ -public class NightboundAbility extends StaticAbility implements MageSingleton { +public class NightboundAbility extends StaticAbility { - private static final NightboundAbility instance; - - static { - instance = new NightboundAbility(); - // instance.addIcon(NightboundAbilityIcon.instance); (needs to be added) + public NightboundAbility() { + super(Zone.BATTLEFIELD, null); } - private Object readResolve() throws ObjectStreamException { - return instance; - } - - public static NightboundAbility getInstance() { - return instance; - } - - private NightboundAbility() { - super(Zone.ALL, null); + private NightboundAbility(final NightboundAbility ability) { + super(ability); } @Override @@ -38,6 +24,6 @@ public class NightboundAbility extends StaticAbility implements MageSingleton { @Override public NightboundAbility copy() { - return instance; + return new NightboundAbility(this); } } diff --git a/Utils/keywords.txt b/Utils/keywords.txt index 1dc14e60261..617997e4f49 100644 --- a/Utils/keywords.txt +++ b/Utils/keywords.txt @@ -16,7 +16,7 @@ Crew|number| Cumulative upkeep|cost| Cycling|cost| Dash|card, manaString| -Daybound|instance| +Daybound|new| Deathtouch|instance| Demonstrate|new| Delve|new| @@ -73,7 +73,7 @@ Mountainwalk|new| Morph|card, cost| Mutate|card, manaString| Myriad|new| -Nightbound|instance| +Nightbound|new| Ninjutsu|cost| Outlast|cost| Partner|instance|