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

[KHM] Implemented Jarl of the Forsaken

Browse source
This commit is contained in:
Evan Kranzler 2021-01-18 07:10:55 -05:00
parent 89f84679fa
commit 07b5898bdc
18 changed files with 82 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,7 +55,7 @@ public final class BushiTenderfoot extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public BushiTenderfoot(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/c/CrushingPain.java
View file

@ -48,7 +48,7 @@ public final class CrushingPain extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public CrushingPain (UUID ownerId, CardSetInfo setInfo) {

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

@ -19,7 +19,7 @@ public final class FatalBlow extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public FatalBlow(UUID ownerId, CardSetInfo setInfo) {

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

@ -24,7 +24,7 @@ public final class FathomFleetCutthroat extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature an opponent controls that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
filter.add(TargetController.OPPONENT.getControllerPredicate());
}

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

@ -24,7 +24,7 @@ public final class FinalStingFaerie extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public FinalStingFaerie(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/g/GiantShark.java
View file

@ -29,7 +29,7 @@ public final class GiantShark extends CardImpl {
static {
filter.add(SubType.ISLAND.getPredicate());
filter2.add(new WasDealtDamageThisTurnPredicate());
filter2.add(WasDealtDamageThisTurnPredicate.instance);
}
public GiantShark(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/h/HoodedAssassin.java
View file

@ -26,7 +26,7 @@ public final class HoodedAssassin extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public HoodedAssassin(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/i/Inflame.java
View file

@ -18,7 +18,7 @@ public final class Inflame extends CardImpl {
private static final FilterCreaturePermanent FILTER = new FilterCreaturePermanent("creature dealt damage this turn");
static {
FILTER.add(new WasDealtDamageThisTurnPredicate());
FILTER.add(WasDealtDamageThisTurnPredicate.instance);
}
public Inflame(UUID ownerId, CardSetInfo setInfo) {

4
Mage.Sets/src/mage/cards/i/InitiateOfBlood.java
View file

@ -56,7 +56,7 @@ public final class InitiateOfBlood extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public InitiateOfBlood(UUID ownerId, CardSetInfo setInfo) {
@ -94,7 +94,7 @@ class GokaTheUnjust extends TokenImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
GokaTheUnjust() {

63
Mage.Sets/src/mage/cards/j/JarlOfTheForsaken.java Normal file
View file

@ -0,0 +1,63 @@
package mage.cards.j;
import mage.MageInt;
import mage.abilities.Ability;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.common.DestroyTargetEffect;
import mage.abilities.keyword.FlashAbility;
import mage.abilities.keyword.ForetellAbility;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
import mage.constants.SubType;
import mage.constants.TargetController;
import mage.filter.FilterPermanent;
import mage.filter.common.FilterCreatureOrPlaneswalkerPermanent;
import mage.filter.predicate.permanent.WasDealtDamageThisTurnPredicate;
import mage.target.TargetPermanent;
import java.util.UUID;
/**
* @author TheElk801
*/
public final class JarlOfTheForsaken extends CardImpl {
private static final FilterPermanent filter = new FilterCreatureOrPlaneswalkerPermanent(
"creature or planeswalker an opponent controls that was dealt damage this turn"
);
static {
filter.add(TargetController.OPPONENT.getControllerPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public JarlOfTheForsaken(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
this.subtype.add(SubType.ZOMBIE);
this.subtype.add(SubType.CLERIC);
this.power = new MageInt(3);
this.toughness = new MageInt(2);
// Flash
this.addAbility(FlashAbility.getInstance());
// When Jarl of the Forsaken enters the battlefield, destroy target creature or planeswalker an opponent controls that was dealt damage this turn.
Ability ability = new EntersBattlefieldTriggeredAbility(new DestroyTargetEffect());
ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability);
// Foretell {1}{B}
this.addAbility(new ForetellAbility(this, "{1}{B}"));
}
private JarlOfTheForsaken(final JarlOfTheForsaken card) {
super(card);
}
@Override
public JarlOfTheForsaken copy() {
return new JarlOfTheForsaken(this);
}
}

2
Mage.Sets/src/mage/cards/l/LurkingDeadeye.java
View file

@ -25,7 +25,7 @@ public final class LurkingDeadeye extends CardImpl {
= new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public LurkingDeadeye(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/o/OgreSiegebreaker.java
View file

@ -25,7 +25,7 @@ public final class OgreSiegebreaker extends CardImpl {
= new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public OgreSiegebreaker(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/o/Opportunist.java
View file

@ -25,7 +25,7 @@ public final class Opportunist extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public Opportunist(UUID ownerId, CardSetInfo setInfo) {

2
Mage.Sets/src/mage/cards/o/OrzhovEuthanist.java
View file

@ -23,7 +23,7 @@ public final class OrzhovEuthanist extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public OrzhovEuthanist(UUID ownerId, CardSetInfo setInfo) {

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

@ -26,7 +26,7 @@ public final class VraskasFinisher extends CardImpl {
);
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
filter.add(TargetController.OPPONENT.getControllerPredicate());
}

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

@ -24,7 +24,7 @@ public final class WitchsMist extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("creature that was dealt damage this turn");
static {
filter.add(new WasDealtDamageThisTurnPredicate());
filter.add(WasDealtDamageThisTurnPredicate.instance);
}
public WitchsMist(UUID ownerId, CardSetInfo setInfo) {

1
Mage.Sets/src/mage/sets/Kaldheim.java
View file

@ -181,6 +181,7 @@ public final class Kaldheim extends ExpansionSet {
cards.add(new SetCardInfo("Invasion of the Giants", 215, Rarity.UNCOMMON, mage.cards.i.InvasionOfTheGiants.class));
cards.add(new SetCardInfo("Iron Verdict", 17, Rarity.COMMON, mage.cards.i.IronVerdict.class));
cards.add(new SetCardInfo("Island", 395, Rarity.LAND, mage.cards.basiclands.Island.class, NON_FULL_USE_VARIOUS));
cards.add(new SetCardInfo("Jarl of the Forsaken", 100, Rarity.COMMON, mage.cards.j.JarlOfTheForsaken.class));
cards.add(new SetCardInfo("Jaspera Sentinel", 178, Rarity.COMMON, mage.cards.j.JasperaSentinel.class));
cards.add(new SetCardInfo("Jorn, God of Winter", 179, Rarity.RARE, mage.cards.j.JornGodOfWinter.class));
cards.add(new SetCardInfo("Kardur's Vicious Return", 217, Rarity.UNCOMMON, mage.cards.k.KardursViciousReturn.class));

5
Mage/src/main/java/mage/filter/predicate/permanent/WasDealtDamageThisTurnPredicate.java
View file

@ -1,4 +1,3 @@
package mage.filter.predicate.permanent;
import mage.filter.predicate.Predicate;
@ -6,10 +5,10 @@ import mage.game.Game;
import mage.game.permanent.Permanent;
/**
*
* @author North
*/
public class WasDealtDamageThisTurnPredicate implements Predicate<Permanent> {
public enum WasDealtDamageThisTurnPredicate implements Predicate<Permanent> {
instance;
@Override
public boolean apply(Permanent input, Game game) {