diff --git a/.gitattributes b/.gitattributes index 5fce62d46ee..bd563f90a18 100644 --- a/.gitattributes +++ b/.gitattributes @@ -14899,6 +14899,8 @@ forge-gui/res/cardsfolder/w/wurmskin_forger.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wurmweaver_coil.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wydwen_the_biting_gale.txt svneol=native#text/plain forge-gui/res/cardsfolder/w/wyluli_wolf.txt svneol=native#text/plain +forge-gui/res/cardsfolder/x/drakestown_forgotten.txt -text +forge-gui/res/cardsfolder/x/scourge_of_the_throne.txt -text forge-gui/res/cardsfolder/x/xantcha.txt -text forge-gui/res/cardsfolder/x/xanthic_statue.txt svneol=native#text/plain forge-gui/res/cardsfolder/x/xantid_swarm.txt -text diff --git a/forge-game/src/main/java/forge/game/trigger/Trigger.java b/forge-game/src/main/java/forge/game/trigger/Trigger.java index a4787e8512d..9bfc0bcba80 100644 --- a/forge-game/src/main/java/forge/game/trigger/Trigger.java +++ b/forge-game/src/main/java/forge/game/trigger/Trigger.java @@ -18,6 +18,7 @@ package forge.game.trigger; import forge.game.Game; +import forge.game.GameEntity; import forge.game.TriggerReplacementBase; import forge.game.card.Card; import forge.game.phase.PhaseHandler; @@ -281,10 +282,16 @@ public abstract class Trigger extends TriggerReplacementBase { } String condition = this.mapParams.get("Condition"); - if( "AltCost".equals(condition) ) { + if ("AltCost".equals(condition)) { final Card moved = (Card) runParams.get("Card"); if( null != moved && !moved.isOptionalCostPaid(OptionalCost.AltCost)) return false; + } else if ("AttackedPlayerWithMostLife".equals(condition)) { + GameEntity attacked = (GameEntity) runParams.get("Attacked"); + if (attacked == null || !attacked.isValid("Player.withMostLife", + this.getHostCard().getController(), this.getHostCard())) { + return false; + } } diff --git a/forge-gui/res/cardsfolder/x/drakestown_forgotten.txt b/forge-gui/res/cardsfolder/x/drakestown_forgotten.txt new file mode 100644 index 00000000000..c657484d523 --- /dev/null +++ b/forge-gui/res/cardsfolder/x/drakestown_forgotten.txt @@ -0,0 +1,12 @@ +Name:Drakestown Forgotten +ManaCost:4 B +Types:Creature Zombie +PT:0/0 +K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with X +1/+1 counters on it, where X is the number of creature cards in all graveyards. +SVar:X:Count$TypeInAllYards.Creature +SVar:NeedsToPlayVar:X GE4 +A:AB$ Pump | Cost$ 2 B SubCounter<1/P1P1> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn. +SVar:Picture:http://www.wizards.com/global/images/magic/general/drakestown_forgotten.jpg + + + diff --git a/forge-gui/res/cardsfolder/x/scourge_of_the_throne.txt b/forge-gui/res/cardsfolder/x/scourge_of_the_throne.txt new file mode 100644 index 00000000000..f4c5a1c08b0 --- /dev/null +++ b/forge-gui/res/cardsfolder/x/scourge_of_the_throne.txt @@ -0,0 +1,10 @@ +Name:Scourge of the Throne +ManaCost:4 R R +Types:Creature Dragon +PT:5/5 +K:Flying +K:Dethrone +T:Mode$ Attacks | ValidCard$ Creature.Self | TriggerZones$ Battlefield | Execute$ TrigUntap | FirstAttack$ True | Condition$ AttackedPlayerWithMostLife | TriggerDescription$ Whenever CARDNAME attacks for the first time each turn, if it's attacking the player with the most life or tied for most life, untap all attacking creatures. After this phase, there is an additional combat phase. +SVar:TrigUntap:AB$ UntapAll | Cost$ 0 | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat +SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ BeginCombat | AfterPhase$ EndCombat +SVar:Picture:http://www.wizards.com/global/images/magic/general/scourge_of_the_throne.jpg \ No newline at end of file