github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-11 19:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix this.spellAbility NPE

Browse source
This commit is contained in:
Noah Gleason 2018-06-23 21:22:44 -04:00
parent b97719fbb6
commit d1d3897442
No known key found for this signature in database
GPG key ID: EC030EC6B0650A40
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
Mage.Sets/src/mage/cards/d/DeliriumCard.java → Mage.Sets/src/mage/cards/d/Delirium.java
View file

@ -6,9 +6,7 @@ import mage.abilities.Ability;
import mage.abilities.common.CastOnlyIfConditionIsTrueAbility;
import mage.abilities.condition.common.OnOpponentsTurnCondition;
import mage.abilities.effects.OneShotEffect;
import mage.abilities.effects.common.PreventCombatDamageBySourceEffect;
import mage.abilities.effects.common.PreventCombatDamageToSourceEffect;
import mage.abilities.effects.common.TapTargetEffect;
import mage.abilities.effects.common.*;
import mage.cards.CardImpl;
import mage.cards.CardSetInfo;
import mage.constants.CardType;
@ -25,7 +23,7 @@ import mage.target.common.TargetCreaturePermanent;
*
* @author noahg
*/
public final class DeliriumCard extends CardImpl {
public final class Delirium extends CardImpl {
private static final FilterCreaturePermanent filter = new FilterCreaturePermanent();
@ -33,38 +31,38 @@ public final class DeliriumCard extends CardImpl {
filter.add(new ControllerIsActivePlayerPredicate());
}
public DeliriumCard(UUID ownerId, CardSetInfo setInfo) {
public Delirium(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.INSTANT}, "{1}{B}{R}");
// Cast this spell only during an opponent’s turn.
this.addAbility(new CastOnlyIfConditionIsTrueAbility(OnOpponentsTurnCondition.instance, "Cast this spell only during an opponent’s turn."));
// Tap target creature that player controls. That creature deals damage equal to its power to the player. Prevent all combat damage that would be dealt to and dealt by the creature this turn.
this.spellAbility.addEffect(new TapTargetEffect().setText("tap target creature that player controls"));
this.spellAbility.addTarget(new TargetCreaturePermanent(filter));
this.spellAbility.addEffect(new DeliriumCardEffect());
this.spellAbility.addEffect(new PreventCombatDamageBySourceEffect(Duration.EndOfTurn).setText("Prevent all combat damage that would be dealt to"));
this.spellAbility.addEffect(new PreventCombatDamageToSourceEffect(Duration.EndOfTurn).setText("and dealt by the creature this turn."));
this.getSpellAbility().addEffect(new TapTargetEffect().setText("target creature that player controls"));
this.getSpellAbility().addTarget(new TargetCreaturePermanent(filter));
this.getSpellAbility().addEffect(new DeliriumEffect());
this.getSpellAbility().addEffect(new PreventDamageToTargetEffect(Duration.EndOfTurn, true).setText("Prevent all combat damage that would be dealt to"));
this.getSpellAbility().addEffect(new PreventDamageByTargetEffect(Duration.EndOfTurn, true).setText("and dealt by the creature this turn."));
}
public DeliriumCard(final DeliriumCard card) {
public Delirium(final Delirium card) {
super(card);
}
@Override
public DeliriumCard copy() {
return new DeliriumCard(this);
public Delirium copy() {
return new Delirium(this);
}
}
class DeliriumCardEffect extends OneShotEffect {
class DeliriumEffect extends OneShotEffect {
public DeliriumCardEffect() {
public DeliriumEffect() {
super(Outcome.Damage);
this.staticText = "that creature deals damage equal to its power to the player";
}
public DeliriumCardEffect(DeliriumCardEffect effect) {
public DeliriumEffect(DeliriumEffect effect) {
super(effect);
}
@ -83,7 +81,7 @@ class DeliriumCardEffect extends OneShotEffect {
}
@Override
public DeliriumCardEffect copy() {
return new DeliriumCardEffect(this);
public DeliriumEffect copy() {
return new DeliriumEffect(this);
}
}

3
Mage.Sets/src/mage/sets/Mirage.java
View file

@ -1,6 +1,7 @@
package mage.sets;
import mage.cards.ExpansionSet;
import mage.cards.d.Delirium;
import mage.constants.Rarity;
import mage.constants.SetType;
@ -83,7 +84,7 @@ public final class Mirage extends ExpansionSet {
cards.add(new SetCardInfo("Dark Banishing", 115, Rarity.COMMON, mage.cards.d.DarkBanishing.class));
cards.add(new SetCardInfo("Dark Ritual", 116, Rarity.COMMON, mage.cards.d.DarkRitual.class));
cards.add(new SetCardInfo("Dazzling Beauty", 8, Rarity.COMMON, mage.cards.d.DazzlingBeauty.class));
cards.add(new SetCardInfo("Delirium", 260, Rarity.UNCOMMON, mage.cards.d.DeliriumCard.class));
cards.add(new SetCardInfo("Delirium", 260, Rarity.UNCOMMON, Delirium.class));
cards.add(new SetCardInfo("Dirtwater Wraith", 117, Rarity.COMMON, mage.cards.d.DirtwaterWraith.class));
cards.add(new SetCardInfo("Disempower", 9, Rarity.COMMON, mage.cards.d.Disempower.class));
cards.add(new SetCardInfo("Disenchant", 10, Rarity.COMMON, mage.cards.d.Disenchant.class));