diff --git a/res/cardsfolder/a/akki_lavarunner_tok_tok_volcano_born.txt b/res/cardsfolder/a/akki_lavarunner_tok_tok_volcano_born.txt index c78afc239c3..4ba47040400 100644 --- a/res/cardsfolder/a/akki_lavarunner_tok_tok_volcano_born.txt +++ b/res/cardsfolder/a/akki_lavarunner_tok_tok_volcano_born.txt @@ -21,7 +21,7 @@ Text:no text PT:2/2 K:Protection from red R:Event$ DamageDone | ValidSource$ Card.Red | ValidTarget$ Player | ReplaceWith$ DmgPlus1 | IsCombat$ False | Description$ If a red source would deal damage to a player, it deals that much damage plus 1 to that player instead. -R:Event$ DamageDone | ValidSource$ Card.Red | ValidTarget$ Player | ReplaceWith$ DmgPlus1Combat | IsCombat$ True +R:Event$ DamageDone | ValidSource$ Card.Red | ValidTarget$ Player | ReplaceWith$ DmgPlus1Combat | IsCombat$ True | Secondary$ True | Description$ If a red source would deal damage to a player, it deals that much damage plus 1 to that player instead. SVar:DmgPlus1:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgPlus1:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount/Plus.1 diff --git a/res/cardsfolder/c/curse_of_bloodletting.txt b/res/cardsfolder/c/curse_of_bloodletting.txt index 218a3f92b97..95ba3530ecf 100644 --- a/res/cardsfolder/c/curse_of_bloodletting.txt +++ b/res/cardsfolder/c/curse_of_bloodletting.txt @@ -5,7 +5,7 @@ Text:no text K:Enchant player A:SP$ Attach | Cost$ 3 R R | ValidTgts$ Player | AILogic$ Curse R:Event$ DamageDone | ValidTarget$ Player.EnchantedBy | ReplaceWith$ DmgTimes2 | IsCombat$ False | Description$ If a source would deal damage to enchanted player, it deals double that damage instead. -R:Event$ DamageDone | ValidTarget$ Player.EnchantedBy | ReplaceWith$ DmgTimes2Combat | IsCombat$ True +R:Event$ DamageDone | ValidTarget$ Player.EnchantedBy | ReplaceWith$ DmgTimes2Combat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to enchanted player, it deals double that damage instead. SVar:DmgTimes2:AB$DealDamage | Cost$ 0 | Defined$ EnchantedPlayer | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgTimes2Combat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ EnchantedPlayer | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount/Times.2 diff --git a/res/cardsfolder/d/divine_presence.txt b/res/cardsfolder/d/divine_presence.txt index a0d27f650b0..42511e6c969 100644 --- a/res/cardsfolder/d/divine_presence.txt +++ b/res/cardsfolder/d/divine_presence.txt @@ -3,7 +3,7 @@ ManaCost:2 W Types:Enchantment Text:no text R:Event$ DamageDone | ValidTarget$ Creature,Player | DamageAmount$ GE4 | ReplaceWith$ Dmg3 | IsCombat$ False | Description$ If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead. -R:Event$ DamageDone | ValidTarget$ Creature,Player | DamageAmount$ GE4 | IsCombat$ True | ReplaceWith$ Dmg3Combat +R:Event$ DamageDone | ValidTarget$ Creature,Player | DamageAmount$ GE4 | IsCombat$ True | ReplaceWith$ Dmg3Combat | Secondary$ True | Description$ If a source would deal 4 or more damage to a creature or player, that source deals 3 damage to that creature or player instead. SVar:Dmg3:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ 3 SVar:Dmg3Combat:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | CombatDamage$ True | NumDmg$ 3 SVar:PlayMain1:TRUE diff --git a/res/cardsfolder/e/empyrial_archangel.txt b/res/cardsfolder/e/empyrial_archangel.txt index 56fc454ad25..c56815d41f0 100644 --- a/res/cardsfolder/e/empyrial_archangel.txt +++ b/res/cardsfolder/e/empyrial_archangel.txt @@ -6,7 +6,7 @@ PT:5/8 K:Flying K:Shroud R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ False | Description$ All damage that would be dealt to you is dealt to CARDNAME instead. -R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True +R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to CARDNAME instead. SVar:DmgSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount diff --git a/res/cardsfolder/f/furnace_of_rath.txt b/res/cardsfolder/f/furnace_of_rath.txt index 5a7104b4629..5481fd28585 100644 --- a/res/cardsfolder/f/furnace_of_rath.txt +++ b/res/cardsfolder/f/furnace_of_rath.txt @@ -3,7 +3,7 @@ ManaCost:1 R R R Types:Enchantment Text:no text R:Event$ DamageDone | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead. -R:Event$ DamageDone | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True +R:Event$ DamageDone | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a creature or player, it deals double that damage to that creature or player instead. SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount/Twice diff --git a/res/cardsfolder/g/gratuitous_violence.txt b/res/cardsfolder/g/gratuitous_violence.txt index aad9285bf0f..08250c13923 100644 --- a/res/cardsfolder/g/gratuitous_violence.txt +++ b/res/cardsfolder/g/gratuitous_violence.txt @@ -3,7 +3,7 @@ ManaCost:2 R R R Types:Enchantment Text:no text R:Event$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwice | IsCombat$ False | Description$ If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead. -R:Event$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True +R:Event$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Creature,Player | ReplaceWith$ DmgTwiceCombat | IsCombat$ True | Secondary$ True | Description$ If a creature you control would deal damage to a creature or player, it deals double that damage to that creature or player instead. SVar:DmgTwice:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgTwiceCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount/Twice diff --git a/res/cardsfolder/l/lashknife_barrier.txt b/res/cardsfolder/l/lashknife_barrier.txt index 37f87bbce4b..41b347f126b 100644 --- a/res/cardsfolder/l/lashknife_barrier.txt +++ b/res/cardsfolder/l/lashknife_barrier.txt @@ -3,7 +3,7 @@ ManaCost:2 W Types:Enchantment Text:no text R:Event$ DamageDone | ValidTarget$ Creature.YouCtrl | ReplaceWith$ DmgMinus1 | IsCombat$ False | Description$ If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead. -R:Event$ DamageDone | ValidTarget$ Creature.YouCtrl | ReplaceWith$ DmgMinus1Combat | IsCombat$ True +R:Event$ DamageDone | ValidTarget$ Creature.YouCtrl | ReplaceWith$ DmgMinus1Combat | IsCombat$ True | Secondary$ True | Description$ If a source would deal damage to a creature you control, it deals that much damage minus 1 to that creature instead. SVar:DmgMinus1:AB$DealDamage | Cost$ 0 | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgMinus1Combat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ ReplacedTarget | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount/Minus.1 diff --git a/res/cardsfolder/m/martyrs_of_korlis.txt b/res/cardsfolder/m/martyrs_of_korlis.txt index d9032e4bebd..d0653d902cb 100644 --- a/res/cardsfolder/m/martyrs_of_korlis.txt +++ b/res/cardsfolder/m/martyrs_of_korlis.txt @@ -4,7 +4,7 @@ Types:Creature Human Text:no text PT:1/6 R:Event$ DamageDone | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DmgMartyrsofKorlisSelf | IsCombat$ False | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by artifacts is dealt to CARDNAME instead. -R:Event$ DamageDone | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DmgMartyrsofKorlisSelfCombat | IsCombat$ True | IsPresent$ Card.Self+untapped +R:Event$ DamageDone | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DmgMartyrsofKorlisSelfCombat | IsCombat$ True | IsPresent$ Card.Self+untapped | Secondary$ True | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by artifacts is dealt to CARDNAME instead. SVar:DmgMartyrsofKorlisSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ MartyrsofKorlisX SVar:DmgMartyrsofKorlisSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ MartyrsofKorlisX SVar:MartyrsofKorlisX:ReplaceCount$DamageAmount diff --git a/res/cardsfolder/p/pariah.txt b/res/cardsfolder/p/pariah.txt index 46048bb5abd..6fc19ef477b 100644 --- a/res/cardsfolder/p/pariah.txt +++ b/res/cardsfolder/p/pariah.txt @@ -5,7 +5,7 @@ Text:no text K:Enchant creature A:SP$ Attach | Cost$ 2 W | ValidTgts$ Creature | TgtPrompt$ Select target creature | AILogic$ Curse R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEnchanted | IsCombat$ False | Description$ All damage that would be dealt to you is dealt to enchanted creature instead. -R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEnchantedCombat | IsCombat$ True +R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEnchantedCombat | IsCombat$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to enchanted creature instead. SVar:DmgEnchanted:AB$DealDamage | Cost$ 0 | Defined$ Enchanted | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgEnchantedCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Enchanted | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount diff --git a/res/cardsfolder/p/pariahs_shield.txt b/res/cardsfolder/p/pariahs_shield.txt index f922b2e9fa8..9d9f215e0c8 100644 --- a/res/cardsfolder/p/pariahs_shield.txt +++ b/res/cardsfolder/p/pariahs_shield.txt @@ -4,7 +4,7 @@ Types:Artifact Equipment Text:no text K:eqPump 3:+0/+0 R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEquipped | IsCombat$ False | IsEquipping$ True | Description$ All damage that would be dealt to you is dealt to equipped creature instead. -R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEquippedCombat | IsCombat$ True | IsEquipping$ True +R:Event$ DamageDone | ValidTarget$ You | ReplaceWith$ DmgEquippedCombat | IsCombat$ True | IsEquipping$ True | Secondary$ True | Description$ All damage that would be dealt to you is dealt to equipped creature instead. SVar:DmgEquipped:AB$DealDamage | Cost$ 0 | Defined$ Equipped | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgEquippedCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Equipped | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount diff --git a/res/cardsfolder/v/veteran_bodyguard.txt b/res/cardsfolder/v/veteran_bodyguard.txt index 9079cfe3f42..54f1785bde3 100644 --- a/res/cardsfolder/v/veteran_bodyguard.txt +++ b/res/cardsfolder/v/veteran_bodyguard.txt @@ -4,7 +4,7 @@ Types:Creature Human Text:no text PT:2/5 R:Event$ DamageDone | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelf | IsCombat$ False | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by unblocked creatures is dealt to CARDNAME instead. -R:Event$ DamageDone | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True | IsPresent$ Card.Self+untapped +R:Event$ DamageDone | ValidSource$ Creature.unblocked | ValidTarget$ You | ReplaceWith$ DmgSelfCombat | IsCombat$ True | IsPresent$ Card.Self+untapped | Secondary$ True | Description$ As long as CARDNAME is untapped, all damage that would be dealt to you by unblocked creatures is dealt to CARDNAME instead. SVar:DmgSelf:AB$DealDamage | Cost$ 0 | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X SVar:DmgSelfCombat:AB$DealDamage | Cost$ 0 | CombatDamage$ True | Defined$ Self | DamageSource$ ReplacedSource | NumDmg$ X SVar:X:ReplaceCount$DamageAmount diff --git a/src/main/java/forge/card/replacement/ReplacementHandler.java b/src/main/java/forge/card/replacement/ReplacementHandler.java index 8fed78f461c..7105fab9032 100644 --- a/src/main/java/forge/card/replacement/ReplacementHandler.java +++ b/src/main/java/forge/card/replacement/ReplacementHandler.java @@ -99,7 +99,13 @@ public class ReplacementHandler { } if (chosenRE != null) { - return executeReplacement(runParams, chosenRE, decider); + if(executeReplacement(runParams, chosenRE, decider)) { + AllZone.getGameLog().add("ReplacementEffect", chosenRE.toString(), 2); + return true; + } + else { + return false; + } } else { return false; }