From b4efa372b2fb1a5bf58bb1054fd31c3fdc7e54c6 Mon Sep 17 00:00:00 2001 From: swordshine Date: Fri, 9 Aug 2013 04:54:45 +0000 Subject: [PATCH] - More cards ready for multiplayer --- res/cardsfolder/o/omen_of_fire.txt | 9 ++++----- res/cardsfolder/r/razor_pendulum.txt | 6 ++---- res/cardsfolder/r/repercussion.txt | 7 ++----- res/cardsfolder/s/smokestack.txt | 6 ++---- src/main/java/forge/card/TriggerReplacementBase.java | 4 +++- 5 files changed, 13 insertions(+), 19 deletions(-) diff --git a/res/cardsfolder/o/omen_of_fire.txt b/res/cardsfolder/o/omen_of_fire.txt index b7868a5f5bf..b8b39610b96 100644 --- a/res/cardsfolder/o/omen_of_fire.txt +++ b/res/cardsfolder/o/omen_of_fire.txt @@ -1,11 +1,10 @@ Name:Omen of Fire ManaCost:3 R R Types:Instant -A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. | SubAbility$ DBSacYou -SVar:DBSacYou:DB$Sacrifice | Amount$ YouX | SacValid$ Plains,Permanent.White | Defined$ You | References$ YouX | SubAbility$ DBSacOpp | SpellDescription$ Each player sacrifices a Plains or a white permanent for each white permanent he or she controls. -SVar:DBSacOpp:DB$Sacrifice | Amount$ OppX | SacValid$ Plains,Permanent.White | Defined$ Opponent | References$ OppX -SVar:YouX:Count$Valid Permanent.White+YouCtrl -SVar:OppX:Count$Valid Permanent.White+YouDontCtrl +A:SP$ ChangeZoneAll | Cost$ 3 R R | ChangeType$ Island | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all Islands to their owners' hands. Each player sacrifices a Plains or a white permanent for each white permanent he or she controls. | SubAbility$ DBSac +SVar:DBSac:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility$ DBSacEach +SVar:DBSacEach:DB$ Sacrifice | Defined$ Player.IsRemembered | Amount$ OppX | SacValid$ Plains,Permanent.White | References$ OppX +SVar:OppX:Count$Valid Permanent.White+RememberedPlayerCtrl SVar:RemRandomDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/omen_of_fire.jpg Oracle:Return all Islands to their owners' hands.\nEach player sacrifices a Plains or a white permanent for each white permanent he or she controls. \ No newline at end of file diff --git a/res/cardsfolder/r/razor_pendulum.txt b/res/cardsfolder/r/razor_pendulum.txt index e7c230cbecc..48b2f2d2547 100644 --- a/res/cardsfolder/r/razor_pendulum.txt +++ b/res/cardsfolder/r/razor_pendulum.txt @@ -1,10 +1,8 @@ Name:Razor Pendulum ManaCost:4 Types:Artifact -T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamageYou | LifeTotal$ You | LifeAmount$ LE5 | TriggerDescription$ At the beginning of each player's end step, if that player has 5 or less life, CARDNAME deals 2 damage to him or her. -T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | LifeTotal$ Opponent | LifeAmount$ LE5 | Secondary$ True | TriggerDescription$ At the beginning of each player's end step, if that player has 5 or less life, CARDNAME deals 2 damage to him or her. -SVar:TrigDamageYou:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ 2 -SVar:TrigDamageOpp:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ 2 +T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigDamage | LifeTotal$ ActivePlayer | LifeAmount$ LE5 | TriggerDescription$ At the beginning of each player's end step, if that player has 5 or less life, CARDNAME deals 2 damage to him or her. +SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredPlayer | NumDmg$ 2 SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/razor_pendulum.jpg Oracle:At the beginning of each player's end step, if that player has 5 or less life, Razor Pendulum deals 2 damage to him or her. \ No newline at end of file diff --git a/res/cardsfolder/r/repercussion.txt b/res/cardsfolder/r/repercussion.txt index 84db931e669..366191352e5 100644 --- a/res/cardsfolder/r/repercussion.txt +++ b/res/cardsfolder/r/repercussion.txt @@ -1,11 +1,8 @@ Name:Repercussion ManaCost:1 R R Types:Enchantment -T:Mode$ DamageDone | ValidTarget$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamageYou | TriggerDescription$ Whenever a creature is dealt damage, CARDNAME deals that much damage to that creature's controller. -T:Mode$ DamageDone | ValidTarget$ Creature.YouDontCtrl | TriggerZones$ Battlefield | Execute$ TrigDamageOpp | Secondary$ True | TriggerDescription$ Whenever a creature is dealt damage, CARDNAME deals that much damage to that creature's controller. -SVar:TrigDamageYou:AB$DealDamage | Cost$ 0 | Defined$ You | NumDmg$ X | References$ X -SVar:TrigDamageOpp:AB$DealDamage | Cost$ 0 | Defined$ Opponent | NumDmg$ Y | References$ X +T:Mode$ DamageDone | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature is dealt damage, CARDNAME deals that much damage to that creature's controller. +SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | Defined$ TriggeredTargetController | NumDmg$ X | References$ X SVar:X:TriggerCount$DamageAmount -SVar:Y:TriggerCount$DamageAmount SVar:Picture:http://www.wizards.com/global/images/magic/general/repercussion.jpg Oracle:Whenever a creature is dealt damage, Repercussion deals that much damage to that creature's controller. \ No newline at end of file diff --git a/res/cardsfolder/s/smokestack.txt b/res/cardsfolder/s/smokestack.txt index 7850df6caa3..d4e8b276540 100644 --- a/res/cardsfolder/s/smokestack.txt +++ b/res/cardsfolder/s/smokestack.txt @@ -1,11 +1,9 @@ Name:Smokestack ManaCost:4 Types:Artifact -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of your upkeep . -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TriggerSacrifice | TriggerDescription$ that player sacrifices a Permanent for each soot counter on CARDNAME +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ At the beginning of each player's upkeep, that player sacrifices a permanent for each soot counter on CARDNAME T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, you may put a soot counter on CARDNAME. -SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | Amount$ X | References$ X | SacValid$ Permanent | SacMessage$ Permanent -SVar:TriggerSacrifice:AB$ Sacrifice | Cost$ 0 | Defined$ Opponent | Amount$ X | References$ X | SacValid$ Permanent | SacMessage$ Permanent +SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 | Defined$ TriggeredPlayer | Amount$ X | References$ X | SacValid$ Permanent | SacMessage$ Permanent SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ SOOT | CounterNum$ 1 SVar:X:Count$CardCounters.SOOT SVar:RemRandomDeck:True diff --git a/src/main/java/forge/card/TriggerReplacementBase.java b/src/main/java/forge/card/TriggerReplacementBase.java index d689e90e4b5..f1f6b986535 100644 --- a/src/main/java/forge/card/TriggerReplacementBase.java +++ b/src/main/java/forge/card/TriggerReplacementBase.java @@ -183,7 +183,9 @@ public abstract class TriggerReplacementBase { if (player.equals("Opponent")) { life = hostController.getOpponent().getLife(); } - + if (player.equals("ActivePlayer")) { + life = game.getPhaseHandler().getPlayerTurn().getLife(); + } if (params.containsKey("LifeAmount")) { lifeCompare = params.get("LifeAmount"); }