External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-25 20:59:14 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[refactoring] CantBlockAbility isn't Singleton anymore

Browse source
This commit is contained in:
North 2012-09-07 10:50:07 +03:00
parent d71c8c0287
commit 7e3944ef66
23 changed files with 57 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/sets/championsofkamigawa/NezumiCutthroat.java
View file

@ -51,7 +51,7 @@ public class NezumiCutthroat extends CardImpl<NezumiCutthroat> {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
this.addAbility(FearAbility.getInstance());
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public NezumiCutthroat(final NezumiCutthroat card) {

2
Mage.Sets/src/mage/sets/championsofkamigawa/VillainousOgre.java
View file

@ -64,7 +64,7 @@ public class VillainousOgre extends CardImpl<VillainousOgre> {
this.power = new MageInt(3);
this.toughness = new MageInt(2);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// As long as you control a Demon, Villainous Ogre has "{B}: Regenerate Villainous Ogre.
this.addAbility( new ConditionalActivatedAbility(

2
Mage.Sets/src/mage/sets/conflux/ShamblingRemains.java
View file

@ -54,7 +54,7 @@ public class ShamblingRemains extends CardImpl<ShamblingRemains> {
this.toughness = new MageInt(3);
// Shambling Remains can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// Unearth {B}{R}
this.addAbility(new UnearthAbility(new ManaCostsImpl("{B}{R}")));
}

2
Mage.Sets/src/mage/sets/darkascension/Gravecrawler.java
View file

@ -60,7 +60,7 @@ public class Gravecrawler extends CardImpl<Gravecrawler> {
this.toughness = new MageInt(1);
// Gravecrawler can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// You may cast Gravecrawler from your graveyard as long as you control a Zombie.
this.addAbility(new SimpleStaticAbility(Zone.ALL, new GravecrawlerPlayEffect()));

2
Mage.Sets/src/mage/sets/darkascension/SightlessGhoul.java
View file

@ -52,7 +52,7 @@ public class SightlessGhoul extends CardImpl<SightlessGhoul> {
this.toughness = new MageInt(2);
// Sightless Ghoul can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// Undying
this.addAbility(new UndyingAbility());
}

2
Mage.Sets/src/mage/sets/darkascension/UnhallowedCathar.java
View file

@ -54,7 +54,7 @@ public class UnhallowedCathar extends CardImpl<UnhallowedCathar> {
this.toughness = new MageInt(1);
// Unhallowed Cathar can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public UnhallowedCathar(final UnhallowedCathar card) {

2
Mage.Sets/src/mage/sets/darksteel/ScavengingScarab.java
View file

@ -48,7 +48,7 @@ public class ScavengingScarab extends CardImpl<ScavengingScarab> {
this.color.setBlack(true);
this.power = new MageInt(3);
this.toughness = new MageInt(3);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public ScavengingScarab(final ScavengingScarab card) {

2
Mage.Sets/src/mage/sets/guildpact/DaggerclawImp.java
View file

@ -50,7 +50,7 @@ public class DaggerclawImp extends CardImpl<DaggerclawImp> {
this.power = new MageInt(3);
this.toughness = new MageInt(1);
this.addAbility(FlyingAbility.getInstance());
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public DaggerclawImp (final DaggerclawImp card) {

2
Mage.Sets/src/mage/sets/innistrad/VampireInterloper.java
View file

@ -54,7 +54,7 @@ public class VampireInterloper extends CardImpl<VampireInterloper> {
this.addAbility(FlyingAbility.getInstance());
// Vampire Interloper can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public VampireInterloper(final VampireInterloper card) {

2
Mage.Sets/src/mage/sets/lorwyn/NightshadeStinger.java
View file

@ -52,7 +52,7 @@ public class NightshadeStinger extends CardImpl<NightshadeStinger> {
this.toughness = new MageInt(1);
this.addAbility(FlyingAbility.getInstance());
// Nightshade Stinger can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public NightshadeStinger(final NightshadeStinger card) {

2
Mage.Sets/src/mage/sets/magic2012/TormentedSoul.java
View file

@ -49,7 +49,7 @@ public class TormentedSoul extends CardImpl<TormentedSoul> {
this.color.setBlack(true);
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
this.addAbility(new UnblockableAbility());
}

2
Mage.Sets/src/mage/sets/magic2013/VeilbornGhoul.java
View file

@ -57,7 +57,7 @@ public class VeilbornGhoul extends CardImpl<VeilbornGhoul> {
this.toughness = new MageInt(1);
// Veilborn Ghoul can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// Whenever a Swamp enters the battlefield under your control, you may return Veilborn Ghoul from your graveyard to your hand.
this.addAbility(new VeilbornGhoulTriggeredAbility());

2
Mage.Sets/src/mage/sets/scourge/CarrionFeeder.java
View file

@ -56,7 +56,7 @@ public class CarrionFeeder extends CardImpl<CarrionFeeder> {
this.toughness = new MageInt(1);
// Carrion Feeder can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// Sacrifice a creature: Put a +1/+1 counter on Carrion Feeder.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,
new AddCountersSourceEffect(CounterType.P1P1.createInstance()),

2
Mage.Sets/src/mage/sets/shadowmoor/AshenmoorGouger.java
View file

@ -51,7 +51,7 @@ public class AshenmoorGouger extends CardImpl<AshenmoorGouger> {
this.power = new MageInt(4);
this.toughness = new MageInt(4);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public AshenmoorGouger(final AshenmoorGouger card) {

2
Mage.Sets/src/mage/sets/shadowmoor/InkfathomInfiltrator.java
View file

@ -52,7 +52,7 @@ public class InkfathomInfiltrator extends CardImpl<InkfathomInfiltrator> {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
this.addAbility(new UnblockableAbility());
}

2
Mage.Sets/src/mage/sets/tenth/SpinelessThug.java
View file

@ -48,7 +48,7 @@ public class SpinelessThug extends CardImpl<SpinelessThug> {
this.color.setBlack(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
}
public SpinelessThug(final SpinelessThug card) {

2
Mage.Sets/src/mage/sets/urzaslegacy/PygmyPyrosaur.java
View file

@ -55,7 +55,7 @@ public class PygmyPyrosaur extends CardImpl<PygmyPyrosaur> {
this.toughness = new MageInt(1);
// Pygmy Pyrosaur can't block.
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
// {R}: Pygmy Pyrosaur gets +1/+0 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
}

2
Mage.Sets/src/mage/sets/worldwake/BojukaBrigand.java
View file

@ -54,7 +54,7 @@ public class BojukaBrigand extends CardImpl<BojukaBrigand> {
this.power = new MageInt(1);
this.toughness = new MageInt(1);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
this.addAbility(new AllyEntersBattlefieldTriggeredAbility(new AddCountersSourceEffect(CounterType.P1P1.createInstance()), true));
}

2
Mage.Sets/src/mage/sets/zendikar/Bloodghast.java
View file

@ -60,7 +60,7 @@ public class Bloodghast extends CardImpl<Bloodghast> {
this.power = new MageInt(2);
this.toughness = new MageInt(1);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
this.addAbility(new LandfallAbility(Zone.GRAVEYARD, new ReturnSourceFromGraveyardToBattlefieldEffect(), true));
ContinuousEffect effect = new GainAbilitySourceEffect(HasteAbility.getInstance(), Duration.WhileOnBattlefield);
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(effect,

2
Mage.Sets/src/mage/sets/zendikar/HagraCrocodile.java
View file

@ -52,7 +52,7 @@ public class HagraCrocodile extends CardImpl<HagraCrocodile> {
this.power = new MageInt(3);
this.toughness = new MageInt(1);
this.addAbility(CantBlockAbility.getInstance());
this.addAbility(new CantBlockAbility());
this.addAbility(new LandfallAbility(new BoostSourceEffect(2, 2, Duration.EndOfTurn), false));
}