From f08f4fec26f414f956784ee8b5847eb3e080aeef Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 28 May 2014 14:03:13 +0000 Subject: [PATCH] - Added Prossh, Skyraider of Kher --- .gitattributes | 1 + .../java/forge/game/card/CardFactoryUtil.java | 2 +- .../forge/game/spellability/SpellAbility.java | 9 +++++++++ .../main/java/forge/game/zone/MagicStack.java | 17 +++++++++++++---- .../cardsfolder/p/prossh_skyraider_of_kher.txt | 11 +++++++++++ 5 files changed, 35 insertions(+), 5 deletions(-) create mode 100644 forge-gui/res/cardsfolder/p/prossh_skyraider_of_kher.txt diff --git a/.gitattributes b/.gitattributes index 1da5cea81ad..bd7afeef6e1 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10162,6 +10162,7 @@ forge-gui/res/cardsfolder/p/prophetic_bolt.txt svneol=native#text/plain forge-gui/res/cardsfolder/p/prophetic_flamespeaker.txt -text forge-gui/res/cardsfolder/p/prophetic_prism.txt svneol=native#text/plain forge-gui/res/cardsfolder/p/prosperity.txt svneol=native#text/plain +forge-gui/res/cardsfolder/p/prossh_skyraider_of_kher.txt -text forge-gui/res/cardsfolder/p/protean_hulk.txt -text forge-gui/res/cardsfolder/p/protean_hydra.txt -text forge-gui/res/cardsfolder/p/protect_serve.txt -text diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index 1374d72d960..00f08a072bc 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -951,7 +951,7 @@ public class CardFactoryUtil { if (sq[0].equals("YouDrewThisTurn")) return doXMath(c.getController().getNumDrawnThisTurn(), m, c); if (sq[0].equals("OppDrewThisTurn")) return doXMath(c.getController().getOpponent().getNumDrawnThisTurn(), m, c); - + if (sq[0].equals("FirstSpellTotalManaSpent")) return doXMath(c.getFirstSpellAbility().getTotalManaSpent(), m, c); if (sq[0].equals("StormCount")) return doXMath(game.getStack().getCardsCastThisTurn().size() - 1, m, c); if (sq[0].equals("DamageDoneThisTurn")) return doXMath(c.getDamageDoneThisTurn(), m, c); if (sq[0].equals("BloodthirstAmount")) return doXMath(c.getController().getBloodthirstAmount(), m, c); diff --git a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java index 5b28a8aff7d..048e6d21e30 100644 --- a/forge-game/src/main/java/forge/game/spellability/SpellAbility.java +++ b/forge-game/src/main/java/forge/game/spellability/SpellAbility.java @@ -90,6 +90,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit private boolean delve = false; private boolean offering = false; private boolean morphup = false; + private int totalManaSpent = 0; /** The pay costs. */ private Cost payCosts = null; @@ -1757,4 +1758,12 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit } } + public void setTotalManaSpent(int totManaSpent) { + this.totalManaSpent = totManaSpent; + } + + public int getTotalManaSpent() { + return this.totalManaSpent; + } + } \ No newline at end of file diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java index f1b47ed87d7..275172e0bb5 100644 --- a/forge-game/src/main/java/forge/game/zone/MagicStack.java +++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java @@ -288,9 +288,11 @@ public class MagicStack /* extends MyObservable */ implements Iterable 0) { @@ -357,12 +362,14 @@ public class MagicStack /* extends MyObservable */ implements Iterable runParams = new HashMap(); if (!(sp instanceof AbilityStatic) && !sp.isCopied()) { diff --git a/forge-gui/res/cardsfolder/p/prossh_skyraider_of_kher.txt b/forge-gui/res/cardsfolder/p/prossh_skyraider_of_kher.txt new file mode 100644 index 00000000000..6b7d84b7b57 --- /dev/null +++ b/forge-gui/res/cardsfolder/p/prossh_skyraider_of_kher.txt @@ -0,0 +1,11 @@ +Name:Prossh, Skyraider of Kher +ManaCost:3 B R G +Types:Legendary Creature Dragon +PT:5/5 +K:Flying +T:Mode$ SpellCast | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When you cast CARDNAME, put X 0/1 red Kobold creature tokens named Kobolds of Kher Keep onto the battlefield, where X is the amount of mana spent to cast CARDNAME. +SVar:TrigToken:AB$ Token | Cost$ 0 | TokenAmount$ X | TokenName$ Kobolds of Kher Keep | TokenTypes$ Creature,Kobold | TokenOwner$ You | TokenColors$ Red | TokenPower$ 0 | TokenToughness$ 1 | References$ X +SVar:X:Count$FirstSpellTotalManaSpent +A:AB$ Pump | Cost$ Sac<1/Creature.Other/another creature> | NumAtt$ 1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. +SVar:Picture:http://www.wizards.com/global/images/magic/general/prossh_skyraider_of_kher.jpg +Oracle:Flying\nWhen you cast Prossh, Skyraider of Kher, put X 0/1 red Kobold creature tokens named Kobolds of Kher Keep onto the battlefield, where X is the amount of mana spent to cast Prossh.\nSacrifice another creature: Prossh gets +1/+0 until end of turn.