External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

[SOI] Fixed to Skulk and Investigate. Some minor tweaks to SOI cards.

Browse source
This commit is contained in:
LevelX2 2016-02-09 12:37:20 +01:00
parent 2a92f5e77a
commit 60bc03e284
10 changed files with 44 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mage/src/main/java/mage/abilities/condition/common/DeliriumCondition.java
View file

@ -38,14 +38,14 @@ import mage.players.Player;
/**
*
*
* @author fireshoes
* @author fireshoes
*/
public class DeliriumCondition implements Condition {
private static DeliriumCondition fInstance = new DeliriumCondition();
private final static DeliriumCondition INSTANCE = new DeliriumCondition();
public static Condition getInstance() {
return fInstance;
return INSTANCE;
}
@Override

12
Mage/src/main/java/mage/abilities/effects/keyword/InvestigateEffect.java
View file

@ -9,22 +9,20 @@ import mage.abilities.Ability;
import mage.abilities.common.SimpleActivatedAbility;
import mage.abilities.costs.common.SacrificeSourceCost;
import mage.abilities.costs.mana.GenericManaCost;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.CreateTokenEffect;
import mage.abilities.effects.common.DrawCardSourceControllerEffect;
import mage.constants.CardType;
import mage.constants.Outcome;
import mage.constants.Zone;
import mage.game.Game;
import mage.game.permanent.token.Token;
/**
*
* @author LevelX2
*/
public class InvestigateEffect extends OneShotEffect {
public class InvestigateEffect extends CreateTokenEffect {
public InvestigateEffect() {
super(Outcome.PutCreatureInPlay);
super(new ClueArtifactToken());
this.staticText = "Investigate. <i>(Put a colorless Clue artifact token onto the battlefield with \"{2}, Sacrifice this artifact: Draw a card.\")</i>";
}
@ -37,10 +35,6 @@ public class InvestigateEffect extends OneShotEffect {
return new InvestigateEffect(this);
}
@Override
public boolean apply(Game game, Ability source) {
return false;
}
}
class ClueArtifactToken extends Token {

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

@ -52,13 +52,12 @@ class SkulkEffect extends RestrictionEffect {
@Override
public boolean applies(Permanent permanent, Ability source, Game game) {
return !permanent.getControllerId().equals(source.getControllerId());
return permanent.getId().equals(source.getSourceId());
}
@Override
public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) {
return blocker.getId().equals(source.getSourceId())
&& blocker.getPower().getValue() >= attacker.getPower().getValue();
return blocker.getPower().getValue() <= attacker.getPower().getValue();
}
@Override

8
Mage/src/main/java/mage/game/permanent/token/DevilToken.java
View file

@ -27,8 +27,7 @@
*/
package mage.game.permanent.token;
import java.util.ArrayList;
import java.util.List;
import java.util.Arrays;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.DiesTriggeredAbility;
@ -43,17 +42,16 @@ import mage.target.common.TargetCreatureOrPlayer;
*/
public class DevilToken extends Token {
final static private List<String> tokenImageSets = new ArrayList<>();
public DevilToken() {
super("Devil", "1/1 red Devil creature with \"When this creature dies, it deals 1 damage to target creature or player.\"");
availableImageSetCodes.addAll(Arrays.asList("SOI"));
cardType.add(CardType.CREATURE);
subtype.add("Devil");
color.setRed(true);
power = new MageInt(1);
toughness = new MageInt(1);
Effect effect = new DamageTargetEffect(1);
effect.setText("When {this} dies, it deals 1 damage to target creature or player");
effect.setText("it deals 1 damage to target creature or player");
Ability ability = new DiesTriggeredAbility(effect);
ability.addTarget(new TargetCreatureOrPlayer());
this.addAbility(ability);