external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-15 10:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Fix 2x DamageDone replacement effect not affecting damage from Emblems

Closes #1097

See merge request core-developers/forge!1953
This commit is contained in:
Michael Kamensky
2019-07-14 04:11:46 +00:00
parent e7e8293fd2 2e2911de2c
commit a68eb85280
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui/res/cardsfolder/a/approach_my_molten_realm.txt
View File

@@ -3,7 +3,7 @@ ManaCost:no cost
Types:Scheme Types:Scheme
T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ MoltenEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, if a source would deal damage, it deals double that damage instead. T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ MoltenEffect | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, until your next turn, if a source would deal damage, it deals double that damage instead.
SVar:MoltenEffect:DB$ Effect | Name$ Molten Realm Effect | ReplacementEffects$ MoltenRealm | SVars$ DmgTwice,MoltenX | Duration$ UntilYourNextTurn SVar:MoltenEffect:DB$ Effect | Name$ Molten Realm Effect | ReplacementEffects$ MoltenRealm | SVars$ DmgTwice,MoltenX | Duration$ UntilYourNextTurn
SVar:MoltenRealm:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ReplaceWith$ DmgTwice | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead. SVar:MoltenRealm:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card,Emblem | ReplaceWith$ DmgTwice | Description$ Until your next turn, if a source would deal damage, it deals double that damage instead.
SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ MoltenX | References$ MoltenX SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ MoltenX | References$ MoltenX
SVar:MoltenX:ReplaceCount$DamageAmount/Twice SVar:MoltenX:ReplaceCount$DamageAmount/Twice
SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/Approach My Molten Realm.full.jpg SVar:Picture:https://downloads.cardforge.org/images/cards/ARC/Approach My Molten Realm.full.jpg

2
forge-gui/res/cardsfolder/d/dictate_of_the_twin_gods.txt
View File

@@ -2,7 +2,7 @@ Name:Dictate of the Twin Gods
ManaCost:3 R R ManaCost:3 R R
Types:Enchantment Types:Enchantment
K:Flash K:Flash
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card,Emblem | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead.
SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
SVar:X:ReplaceCount$DamageAmount/Twice SVar:X:ReplaceCount$DamageAmount/Twice
SVar:PlayMain1:TRUE SVar:PlayMain1:TRUE

2
forge-gui/res/cardsfolder/e/equal_treatment.txt
View File

@@ -2,7 +2,7 @@ Name:Equal Treatment
ManaCost:1 W ManaCost:1 W
Types:Instant Types:Instant
A:SP$ Effect | Cost$ 1 W | Name$ Equal Treatment Effect | ReplacementEffects$ EqualEvent | SVars$ DmgTwo | SubAbility$ DBDraw | SpellDescription$ If any source would deal 1 or more damage to a permanent or player this turn, it deals 2 damage to that permanent or player instead. Draw a card. A:SP$ Effect | Cost$ 1 W | Name$ Equal Treatment Effect | ReplacementEffects$ EqualEvent | SVars$ DmgTwo | SubAbility$ DBDraw | SpellDescription$ If any source would deal 1 or more damage to a permanent or player this turn, it deals 2 damage to that permanent or player instead. Draw a card.
SVar:EqualEvent:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwo | Description$ If any source would deal 1 or more damage to a permanent or player this turn, it deals 2 damage to that permanent or player instead. SVar:EqualEvent:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card,Emblem | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwo | Description$ If any source would deal 1 or more damage to a permanent or player this turn, it deals 2 damage to that permanent or player instead.
SVar:DmgTwo:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 2 SVar:DmgTwo:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ 2
SVar:DBDraw:DB$ Draw | NumCards$ 1 SVar:DBDraw:DB$ Draw | NumCards$ 1
AI:RemoveDeck:All AI:RemoveDeck:All

2
forge-gui/res/cardsfolder/f/furnace_of_rath.txt
View File

@@ -1,7 +1,7 @@
Name:Furnace of Rath Name:Furnace of Rath
ManaCost:1 R R R ManaCost:1 R R R
Types:Enchantment Types:Enchantment
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card,Emblem | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead.
SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
SVar:X:ReplaceCount$DamageAmount/Twice SVar:X:ReplaceCount$DamageAmount/Twice
SVar:PlayMain1:TRUE SVar:PlayMain1:TRUE

2
forge-gui/res/cardsfolder/g/gisela_blade_of_goldnight.txt
View File

@@ -4,7 +4,7 @@ Types:Legendary Creature Angel
PT:5/5 PT:5/5
K:Flying K:Flying
K:First Strike K:First Strike
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Opponent,Permanent.OppCtrl | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead. R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card,Emblem | ValidTarget$ Opponent,Permanent.OppCtrl | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to an opponent or a permanent an opponent controls, that source deals double that damage to that player or permanent instead.
SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
SVar:X:ReplaceCount$DamageAmount/Twice SVar:X:ReplaceCount$DamageAmount/Twice
S:Mode$ PreventDamage | Target$ You,Permanent.YouCtrl | Amount$ HalfUp | Description$ If a source would deal damage to you or a permanent you control, prevent half that damage, rounded up. S:Mode$ PreventDamage | Target$ You,Permanent.YouCtrl | Amount$ HalfUp | Description$ If a source would deal damage to you or a permanent you control, prevent half that damage, rounded up.

4
forge-gui/res/cardsfolder/g/goldnight_castigator.txt
View File

@@ -4,8 +4,8 @@ Types:Creature Angel
PT:4/9 PT:4/9
K:Flying K:Flying
K:Haste K:Haste
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ You | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to you, it deals double that damage to you instead. R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card,Emblem | ValidTarget$ You | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to you, it deals double that damage to you instead.
R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card | ValidTarget$ Card.Self | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to CARDNAME, it deals double that damage to CARDNAME instead. R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Card,Emblem | ValidTarget$ Card.Self | ReplaceWith$ DmgTwice | Description$ If a source would deal damage to CARDNAME, it deals double that damage to CARDNAME instead.
SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ X | References$ X
SVar:X:ReplaceCount$DamageAmount/Twice SVar:X:ReplaceCount$DamageAmount/Twice
SVar:Picture:http://www.wizards.com/global/images/magic/general/goldnight_castigator.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/goldnight_castigator.jpg

2
forge-gui/res/cardsfolder/s/stronghold_furnace.txt
View File

@@ -1,7 +1,7 @@
Name:Stronghold Furnace Name:Stronghold Furnace
ManaCost:no cost ManaCost:no cost
Types:Plane Rath Types:Plane Rath
R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card | ValidTarget$ Permanent,Player| ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead. R:Event$ DamageDone | ActiveZones$ Command | ValidSource$ Card,Emblem | ValidTarget$ Permanent,Player| ReplaceWith$ DmgTwice | Description$ If a source would deal damage to a permanent or player, it deals double that damage to that permanent or player instead.
SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ Y | References$ Y SVar:DmgTwice:DB$ ReplaceEffect | VarName$ DamageAmount | VarValue$ Y | References$ Y
SVar:Y:ReplaceCount$DamageAmount/Twice SVar:Y:ReplaceCount$DamageAmount/Twice
T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, CARDNAME deals 1 damage to any target. T:Mode$ PlanarDice | Result$ Chaos | TriggerZones$ Command | Execute$ RolledChaos | TriggerDescription$ Whenever you roll {CHAOS}, CARDNAME deals 1 damage to any target.