github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-29 11:09:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Skulk is now singleton"

Browse source 
This reverts commit 6ca03a339a.
This commit is contained in:
Evan Kranzler 2017-09-17 19:57:54 -04:00
parent 1819c6e8a8
commit 356737075a
16 changed files with 35 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/b/BehindTheScenes.java
View file

@ -52,7 +52,7 @@ public class BehindTheScenes extends CardImpl {
// Creatures you control have skulk.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD,
new GainAbilityControlledEffect(SkulkAbility.getInstance(), Duration.WhileOnBattlefield, FILTER_PERMANENT_CREATURES)));
new GainAbilityControlledEffect(new SkulkAbility(), Duration.WhileOnBattlefield, FILTER_PERMANENT_CREATURES)));
// {4}{W}: Creatures you control get +1/+1 until end of turn.
this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD,

2
Mage.Sets/src/mage/cards/f/FarbogRevenant.java
View file

@ -49,7 +49,7 @@ public class FarbogRevenant extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// Lifelink
this.addAbility(LifelinkAbility.getInstance());

2
Mage.Sets/src/mage/cards/f/Fogwalker.java
View file

@ -60,7 +60,7 @@ public class Fogwalker extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// When Fogwalker enters the battlefield, target creature an opponent controls doesn't untap during it controler's next untap step.
EntersBattlefieldTriggeredAbility ability = new EntersBattlefieldTriggeredAbility(new DontUntapInControllersNextUntapStepTargetEffect());
ability.addTarget(new TargetCreaturePermanent(filter));

2
Mage.Sets/src/mage/cards/f/ForgottenCreation.java
View file

@ -56,7 +56,7 @@ public class ForgottenCreation extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// At the beginning of your upkeep, you may discard all the cards in your hand. If you do, draw that many cards.
this.addAbility(new BeginningOfUpkeepTriggeredAbility(new ForgottenCreationEffect(), TargetController.YOU, true));
}

2
Mage.Sets/src/mage/cards/f/FurtiveHomunculus.java
View file

@ -48,7 +48,7 @@ public class FurtiveHomunculus extends CardImpl {
this.toughness = new MageInt(1);
// Skulk (This creature can't be blocked by creatures with greater power.)
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
}
public FurtiveHomunculus(final FurtiveHomunculus card) {

4
Mage.Sets/src/mage/cards/o/OdricLunarchMarshal.java
View file

@ -171,7 +171,7 @@ class OdricLunarchMarshalEffect extends OneShotEffect {
// Skulk
if (game.getBattlefield().contains(filterSkulk, source.getControllerId(), 1, game)) {
game.addEffect(new GainAbilityControlledEffect(SkulkAbility.getInstance(), Duration.EndOfTurn, filterCreatures), source);
game.addEffect(new GainAbilityControlledEffect(new SkulkAbility(), Duration.EndOfTurn, filterCreatures), source);
}
// Trample
@ -185,4 +185,4 @@ class OdricLunarchMarshalEffect extends OneShotEffect {
}
return true;
}
}
}

2
Mage.Sets/src/mage/cards/p/PaleRiderOfTrostad.java
View file

@ -50,7 +50,7 @@ public class PaleRiderOfTrostad extends CardImpl {
this.toughness = new MageInt(3);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// When Pale Rider of Trostad enters the battlefield, discard a card.
this.addAbility(new EntersBattlefieldTriggeredAbility(new DiscardControllerEffect(1), false));

2
Mage.Sets/src/mage/cards/p/PersistentNightmare.java
View file

@ -54,7 +54,7 @@ public class PersistentNightmare extends CardImpl {
this.nightCard = true;
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// When Persistent Nightmare deals combat damage to a player, return it to its owner's hand.
this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(new ReturnToHandSourceEffect(), false));

2
Mage.Sets/src/mage/cards/r/RancidRats.java
View file

@ -50,7 +50,7 @@ public class RancidRats extends CardImpl {
this.toughness = new MageInt(1);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// Deathtouch
this.addAbility(DeathtouchAbility.getInstance());
}

2
Mage.Sets/src/mage/cards/s/SkeletonKey.java
View file

@ -57,7 +57,7 @@ public class SkeletonKey extends CardImpl {
this.subtype.add(SubType.EQUIPMENT);
// Equipped creature has skulk.
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(SkulkAbility.getInstance(), AttachmentType.EQUIPMENT)));
this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(new SkulkAbility(), AttachmentType.EQUIPMENT)));
// Whenever equipped creature deals combat damage to a player, you may draw a card. if you do, discard a card.
Ability ability = new DealsDamageToAPlayerAttachedTriggeredAbility(new DrawCardSourceControllerEffect(1), "equipped creature", true);

2
Mage.Sets/src/mage/cards/u/UninvitedGeist.java
View file

@ -54,7 +54,7 @@ public class UninvitedGeist extends CardImpl {
this.secondSideCardClazz = UnimpededTrespasser.class;
// Skulk (This creature can't be blocked by creatures with greater power.)
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// When Uninvited Geist deals combat damage to a player, transform it.
this.addAbility(new TransformAbility());

2
Mage.Sets/src/mage/cards/v/VampireCutthroat.java
View file

@ -50,7 +50,7 @@ public class VampireCutthroat extends CardImpl {
this.toughness = new MageInt(1);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// Lifelink
this.addAbility(LifelinkAbility.getInstance());
}

2
Mage.Sets/src/mage/cards/w/WharfInfiltrator.java
View file

@ -62,7 +62,7 @@ public class WharfInfiltrator extends CardImpl {
this.toughness = new MageInt(1);
// Skulk
this.addAbility(SkulkAbility.getInstance());
this.addAbility(new SkulkAbility());
// Whenever Wharf Infiltrator deals combat damage to a player, you may draw a card. If you do, discard a card.
Effect effect = new DrawDiscardControllerEffect();

22
Mage.Tests/src/test/java/org/mage/test/cards/abilities/add/GainAbilitiesTest.java
View file

@ -14,34 +14,34 @@ public class GainAbilitiesTest extends CardTestPlayerBase {
/*
Reported bug: Behind the Scenes grants skulk to all creatures instead of just ones under owner's control
*/
*/
@Test
public void behindTheScenesShouldOnlyGrantSkulkToCreaturesYouControl() {
/*
Behind the Scenes {2}{B}
Enchantment
Creatures you control have skulk. (They can't be blocked by creatures with greater power.)
{4}{W}: Creatures you control get +1/+1 until end of turn
*/
String bScenes = "Behind the Scenes";
*/
String bScenes = "Behind the Scenes";
String hGiant = "Hill Giant"; // {3}{R} 3/3
String bSable = "Bronze Sable"; // {2} 2/1
String memnite = "Memnite"; // {0} 1/1
String gBears = "Grizzly Bears"; // {1}{G} 2/2
addCard(Zone.BATTLEFIELD, playerA, bScenes);
addCard(Zone.BATTLEFIELD, playerA, hGiant);
addCard(Zone.BATTLEFIELD, playerA, bSable);
addCard(Zone.BATTLEFIELD, playerB, memnite);
addCard(Zone.BATTLEFIELD, playerB, gBears);
setStopAt(1, PhaseStep.PRECOMBAT_MAIN);
execute();
assertAbility(playerA, hGiant, SkulkAbility.getInstance(), true);
assertAbility(playerA, bSable, SkulkAbility.getInstance(), true);
assertAbility(playerB, memnite, SkulkAbility.getInstance(), false);
assertAbility(playerB, gBears, SkulkAbility.getInstance(), false);
assertAbility(playerA, hGiant, new SkulkAbility(), true);
assertAbility(playerA, bSable, new SkulkAbility(), true);
assertAbility(playerB, memnite, new SkulkAbility(), false);
assertAbility(playerB, gBears, new SkulkAbility(), false);
}
}

24
Mage/src/main/java/mage/abilities/keyword/SkulkAbility.java
View file

@ -5,12 +5,11 @@
*/
package mage.abilities.keyword;
import java.io.ObjectStreamException;
import mage.abilities.Ability;
import mage.abilities.EvasionAbility;
import mage.abilities.MageSingleton;
import mage.abilities.StaticAbility;
import mage.abilities.effects.RestrictionEffect;
import mage.constants.Duration;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.Permanent;
@ -18,31 +17,26 @@ import mage.game.permanent.Permanent;
*
* @author LevelX2
*/
public class SkulkAbility extends EvasionAbility implements MageSingleton {
public class SkulkAbility extends StaticAbility {
private static final SkulkAbility instance = new SkulkAbility();
private Object readResolve() throws ObjectStreamException {
return instance;
public SkulkAbility() {
super(Zone.BATTLEFIELD, new SkulkEffect(Duration.WhileOnBattlefield));
}
public static SkulkAbility getInstance() {
return instance;
}
private SkulkAbility() {
this.addEffect(new SkulkEffect(Duration.WhileOnBattlefield));
public SkulkAbility(final SkulkAbility ability) {
super(ability);
}
@Override
public Ability copy() {
return instance;
return new SkulkAbility(this);
}
@Override
public String getRule() {
return "Skulk <i>(This creature can't be blocked by creatures with greater power.)</i>";
}
}
class SkulkEffect extends RestrictionEffect {

2
Utils/keywords.txt
View file

@ -76,7 +76,7 @@ Shadow|instance|
Shroud|instance|
Soulbond|instance|
Soulshift|number|
Skulk|instance|
Skulk|new|
Storm|new|
Sunburst|new|
Swampcycling|cost|