Few card fixes (#1814)

Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>

forge-game/src/main/java/forge/game/Game.java

@@ -162,7 +162,6 @@ public class Game {
     public Player getStartingPlayer() {
         return startingPlayer;
     }
-
     public void setStartingPlayer(final Player p) {
         startingPlayer = p;
     }
@@ -170,7 +169,6 @@ public class Game {
     public Player getMonarch() {
         return monarch;
     }
-
     public void setMonarch(final Player p) {
         monarch = p;
     }
@@ -178,7 +176,6 @@ public class Game {
     public Player getMonarchBeginTurn() {
         return monarchBeginTurn;
     }
-
     public void setMonarchBeginTurn(Player monarchBeginTurn) {
         this.monarchBeginTurn = monarchBeginTurn;
     }

forge-gui/res/cardsfolder/a/argothian_pixies.txt

@@ -3,5 +3,5 @@ ManaCost:1 G
 Types:Creature Faerie
 PT:2/1
 S:Mode$ CantBlockBy | ValidAttacker$ Creature.Self | ValidBlocker$ Artifact.Creature | Description$ CARDNAME can't be blocked by artifact creatures.
-R:Event$ DamageDone | Prevent$ True | ValidSource$ Artifact.Creature | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by artifact creatures.
+R:Event$ DamageDone | Prevent$ True | ValidSource$ Artifact.Creature+inZoneBattlefield | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by artifact creatures.
 Oracle:Argothian Pixies can't be blocked by artifact creatures.\nPrevent all damage that would be dealt to Argothian Pixies by artifact creatures.

forge-gui/res/cardsfolder/c/chameleon_blur.txt

@@ -2,5 +2,5 @@ Name:Chameleon Blur
 ManaCost:3 G
 Types:Instant
 A:SP$ Effect | ReplacementEffects$ RPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that creatures would deal to players this turn.
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature | ValidTarget$ Player | Description$ Prevent all damage that creatures would deal to players this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.inZoneBattlefield | ValidTarget$ Player | Description$ Prevent all damage that creatures would deal to players this turn.
 Oracle:Prevent all damage that creatures would deal to players this turn.

forge-gui/res/cardsfolder/c/champion_lancer.txt

@@ -2,5 +2,5 @@ Name:Champion Lancer
 ManaCost:4 W W
 Types:Creature Human Knight
 PT:3/3
-R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures.
+R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.inZoneBattlefield | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures.
 Oracle:Prevent all damage that would be dealt to Champion Lancer by creatures.

forge-gui/res/cardsfolder/c/chant_of_vitu_ghazi.txt

@@ -3,7 +3,7 @@ ManaCost:6 W W
 Types:Instant
 K:Convoke
 A:SP$ Effect | Cost$ 6 W W | ReplacementEffects$ RepDmg | SpellDescription$ Prevent all damage that would be dealt by creatures this turn. You gain life equal to the damage prevented this way.
-SVar:RepDmg:Event$ DamageDone | ValidSource$ Creature | ReplaceWith$ GainLifeYou | PreventionEffect$ True | Description$ Prevent all damage that would be dealt by creatures this turn. You gain life equal to the damage prevented this way.
+SVar:RepDmg:Event$ DamageDone | ValidSource$ Creature.inZoneBattlefield | ReplaceWith$ GainLifeYou | PreventionEffect$ True | Description$ Prevent all damage that would be dealt by creatures this turn. You gain life equal to the damage prevented this way.
 SVar:GainLifeYou:DB$ GainLife | Defined$ You | LifeAmount$ X
 SVar:X:ReplaceCount$DamageAmount
 Oracle:Convoke (Your creatures can help cast this spell. Each creature you tap while casting this spell pays for {1} or one mana of that creature's color.)\nPrevent all damage that would be dealt by creatures this turn. You gain life equal to the damage prevented this way.

forge-gui/res/cardsfolder/c/circle_of_solace.txt

@@ -3,10 +3,8 @@ ManaCost:3 W
 Types:Enchantment
 K:ETBReplacement:Other:ChooseCT
 SVar:ChooseCT:DB$ ChooseType | Defined$ You | Type$ Creature | SpellDescription$ As CARDNAME enters the battlefield, choose a creature type. | AILogic$ MostProminentOppControls
-A:AB$ ChooseCard | Cost$ 1 W | Choices$ Creature.ChosenType | RememberChosen$ True | AILogic$ NeedsPrevention | SubAbility$ DBEffect | SpellDescription$ The next time a creature of the chosen type would deal damage to you this turn, prevent that damage.
+A:AB$ Effect | Cost$ 1 W | ReplacementEffects$ RPreventNextFromCreature | SpellDescription$ The next time a creature of the chosen type would deal damage to you this turn, prevent that damage.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPreventNextFromCreature | RememberObjects$ Remembered | SubAbility$ DBCleanup | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1
+SVar:RPreventNextFromCreature:Event$ DamageDone | ValidSource$ Card.ChosenType+inZoneBattlefield | ValidTarget$ You | ReplaceWith$ ExileEffect | PreventionEffect$ True | Description$ The next time a creature of the chosen type would deal damage to you this turn, prevent that damage.
-SVar:RPreventNextFromCreature:Event$ DamageDone | ValidSource$ Card.IsRemembered+ChosenType | ValidTarget$ You | ReplaceWith$ ExileEffect | PreventionEffect$ True | Description$ The next time a creature of the chosen type would deal damage to you this turn, prevent that damage.
 SVar:ExileEffect:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile
-SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:NonStackingEffect:True
 Oracle:As Circle of Solace enters the battlefield, choose a creature type.\n{1}{W}: The next time a creature of the chosen type would deal damage to you this turn, prevent that damage.

forge-gui/res/cardsfolder/e/ethereal_haze.txt

@@ -2,5 +2,5 @@ Name:Ethereal Haze
 ManaCost:W
 Types:Instant Arcane
 A:SP$ Effect | ReplacementEffects$ RPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt by creatures this turn.
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature | Description$ Prevent all damage that would be dealt by creatures this turn.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.inZoneBattlefield | Description$ Prevent all damage that would be dealt by creatures this turn.
 Oracle:Prevent all damage that would be dealt by creatures this turn.

forge-gui/res/cardsfolder/g/gratuitous_violence.txt

@@ -1,7 +1,7 @@
 Name:Gratuitous Violence
 ManaCost:2 R R R
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature.YouCtrl | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a creature you control 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$ Creature.YouCtrl+inZoneBattlefield | ValidTarget$ Permanent,Player | ReplaceWith$ DmgTwice | Description$ If a creature you control 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
 SVar:X:ReplaceCount$DamageAmount/Twice
 SVar:PlayMain1:TRUE

forge-gui/res/cardsfolder/h/heroism.txt

@@ -1,9 +1,10 @@
 Name:Heroism
 ManaCost:2 W
 Types:Enchantment
-A:AB$ RepeatEach | Cost$ Sac<1/Creature.White/White Creature> | RepeatCards$ Creature.attacking+Red | RepeatSubAbility$ DBEffect | SubAbility$ DBEffect | SpellDescription$ For each attacking red creature, prevent all combat damage that would be dealt by that creature this turn unless its controller pays {2}{R}.
+A:AB$ RepeatEach | Cost$ Sac<1/Creature.White/White Creature> | RepeatCards$ Creature.attacking+Red | UseImprinted$ True | RepeatSubAbility$ DBPump | SubAbility$ DBEffect | SpellDescription$ For each attacking red creature, prevent all combat damage that would be dealt by that creature this turn unless its controller pays {2}{R}.
-SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPrevent | RememberObjects$ Remembered | ForgetOnMoved$ Battlefield | UnlessCost$ 2 R | UnlessPayer$ RememberedController | ShowCurrentCard$ Remembered
+SVar:DBPump:DB$ Pump | RememberObjects$ Imprinted | UnlessCost$ 2 R | UnlessPayer$ ImprintedController | ShowCurrentCard$ Imprinted
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | IsCombat$ True | ValidSource$ Card.IsRemembered | Description$ Prevent all combat damage that would be dealt by that creature.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ RPrevent | RememberObjects$ Remembered | ForgetOnMoved$ Battlefield | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:AIPreference:SacCost$Creature.token
 AI:RemoveDeck:Random
 AI:RemoveDeck:All

forge-gui/res/cardsfolder/o/obscuring_haze.txt

@@ -3,5 +3,5 @@ ManaCost:2 G
 Types:Instant
 S:Mode$ Continuous | CharacteristicDefining$ True | AddKeyword$ Alternative Cost:0 | IsPresent$ Card.IsCommander+YouCtrl | Description$ If you control a commander, you may cast this spell without paying its mana cost.
 A:SP$ Effect | Cost$ 2 G | ReplacementEffects$ RPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt this turn by creatures your opponents control.
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.OppCtrl | Description$ Prevent all damage that would be dealt this turn by creatures your opponents control.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.OppCtrl+inZoneBattlefield | Description$ Prevent all damage that would be dealt this turn by creatures your opponents control.
 Oracle:If you control a commander, you may cast this spell without paying its mana cost.\nPrevent all damage that would be dealt this turn by creatures your opponents control.

forge-gui/res/cardsfolder/s/scarecrow.txt

@@ -3,6 +3,6 @@ ManaCost:5
 Types:Artifact Creature Scarecrow
 PT:2/2
 A:AB$ Effect | Cost$ 6 T | Name$ Scarecrow Effect | ReplacementEffects$ RPrevent | SpellDescription$ Prevent all damage that would be dealt to you this turn by creatures with flying.
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ You | ValidSource$ Creature.withFlying | Description$ Prevent all damage that would be dealt to you this turn by creatures with flying.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidTarget$ You | ValidSource$ Creature.withFlying+inZoneBattlefield | Description$ Prevent all damage that would be dealt to you this turn by creatures with flying.
 AI:RemoveDeck:All
 Oracle:{6}, {T}: Prevent all damage that would be dealt to you this turn by creatures with flying.

forge-gui/res/cardsfolder/s/selfless_exorcist.txt

@@ -3,7 +3,7 @@ ManaCost:3 W W
 Types:Creature Human Cleric
 PT:3/4
 A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Origin$ Graveyard | Destination$ Exile | SubAbility$ DBDealDamage | SpellDescription$ Exile target creature card from a graveyard. That card deals damage equal to its power to CARDNAME.
-SVar:DBDealDamage:DB$ DealDamage | Defined$ Self | NumDmg$ X
+SVar:DBDealDamage:DB$ DealDamage | Defined$ Self | NumDmg$ X | DamageSource$ Targeted
 SVar:X:Targeted$CardPower
 AI:RemoveDeck:All
 Oracle:{T}: Exile target creature card from a graveyard. That card deals damage equal to its power to Selfless Exorcist.

forge-gui/res/cardsfolder/s/skophos_warleader.txt

@@ -2,5 +2,5 @@ Name:Skophos Warleader
 ManaCost:4 R
 Types:Creature Minotaur Warrior
 PT:4/5
-A:AB$ Pump | Cost$ R Sac<1/Creature.Other;Enchantment.Other/another creature or enchantment> | Defined$ Self | NumAtt$ 1 | KW$ Menace | SpellDescription$ CARDNAME gets +1/+0 and gains menace until end of turn.
+A:AB$ Pump | Cost$ R Sac<1/Creature.Other;Enchantment/another creature or enchantment> | Defined$ Self | NumAtt$ 1 | KW$ Menace | SpellDescription$ CARDNAME gets +1/+0 and gains menace until end of turn.
 Oracle:{R}, Sacrifice another creature or an enchantment: Skophos Warleader gets +1/+0 and gains menace until end of turn. (It can't be blocked except by two or more creatures.)

forge-gui/res/cardsfolder/s/slaughter_priest_of_mogis.txt

@@ -5,6 +5,6 @@ PT:2/2
 T:Mode$ Sacrificed | ValidCard$ Permanent.YouCtrl | Execute$ TrigPump | TriggerZones$ Battlefield | TriggerDescription$ Whenever you sacrifice a permanent, CARDNAME gets +2/+0 until end of turn.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ +2
 SVar:BuffedBy:Permanent.YouCtrl
-A:AB$ Pump | Cost$ 2 Sac<1/Creature;Enchantment/creature or enchantment> | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
+A:AB$ Pump | Cost$ 2 Sac<1/Creature.Other;Enchantment/creature or enchantment> | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn.
 AI:RemoveDeck:All
 Oracle:Whenever you sacrifice a permanent, Slaughter-Priest of Mogis gets +2/+0 until end of turn.\n{2}, Sacrifice another creature or an enchantment: Slaughter-Priest of Mogis gains first strike until end of turn.

forge-gui/res/cardsfolder/s/sphere_of_purity.txt

@@ -1,7 +1,7 @@
 Name:Sphere of Purity
 ManaCost:3 W
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Artifact | ValidTarget$ You | ReplaceWith$ DBReplace | PreventionEffect$ True | Description$ If an artifact would deal damage to you, prevent 1 of that damage.
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Artifact.inZoneBattlefield | ValidTarget$ You | ReplaceWith$ DBReplace | PreventionEffect$ True | Description$ If an artifact would deal damage to you, prevent 1 of that damage.
 SVar:DBReplace:DB$ ReplaceDamage | Amount$ 1
 AI:RemoveDeck:Random
 Oracle:If an artifact would deal damage to you, prevent 1 of that damage.

forge-gui/res/cardsfolder/t/thwart_the_enemy.txt

@@ -2,6 +2,6 @@ Name:Thwart the Enemy
 ManaCost:2 G
 Types:Instant
 A:SP$ Effect | Cost$ 2 G | ReplacementEffects$ RPrevent | AILogic$ Fog | SpellDescription$ Prevent all damage that would be dealt this turn by creatures your opponents control.
-SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.OppCtrl | Description$ Prevent all damage that would be dealt this turn by creatures your opponents control.
+SVar:RPrevent:Event$ DamageDone | Prevent$ True | ActiveZones$ Command | ValidSource$ Creature.OppCtrl+inZoneBattlefield | Description$ Prevent all damage that would be dealt this turn by creatures your opponents control.
 AI:RemoveDeck:All
 Oracle:Prevent all damage that would be dealt this turn by creatures your opponents control.

forge-gui/res/cardsfolder/t/tresserhorn_skyknight.txt

@@ -3,5 +3,5 @@ ManaCost:5 B B
 Types:Creature Zombie Knight
 PT:5/3
 K:Flying
-R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.withFirst Strike | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures with first strike.
+R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.inZoneBattlefield+withFirst Strike | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures with first strike.
 Oracle:Flying\nPrevent all damage that would be dealt to Tresserhorn Skyknight by creatures with first strike.

forge-gui/res/cardsfolder/u/uncle_istvan.txt

@@ -2,5 +2,5 @@ Name:Uncle Istvan
 ManaCost:1 B B B
 Types:Creature Human
 PT:1/3
-R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures.
+R:Event$ DamageDone | Prevent$ True | ValidSource$ Creature.inZoneBattlefield | ValidTarget$ Creature.Self | Description$ Prevent all damage that would be dealt to CARDNAME by creatures.
 Oracle:Prevent all damage that would be dealt to Uncle Istvan by creatures.

forge-gui/res/cardsfolder/upcoming/mishra_claimed_by_gix_mishra_lost_to_phyrexia.txt

@@ -5,8 +5,9 @@ PT:3/5
 T:Mode$ AttackersDeclared | AttackingPlayer$ You | AttackedTarget$ Player,Planeswalker | Execute$ TrigDrain | TriggerZones$ Battlefield | TriggerDescription$ Whenever you attack, each opponent loses X life and you gain X life, where X is the number of attacking creatures. If CARDNAME and a creature named Phyrexian Dragon Engine are attacking, and you both own and control them, exile them, then meld them into Mishra, Lost to Phyrexia. It enters the battlefield tapped and attacking
 SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ X | SubAbility$ DBGainLife
 SVar:DBGainLife:DB$ GainLife | LifeAmount$ X | SubAbility$ Meld 
-SVar:Meld:DB$ Meld | IsPresent$ Card.Self+YouOwn+attacking | IsPresent2$ Creature.YouCtrl+YouOwn+namedPhyrexian Dragon Engine+attacking | Name$ Mishra, Lost to Phyrexia | Tapped$ True | Attacking$ True | Primary$ Mishra, Claimed by Gix | Secondary$ Phyrexian Dragon Engine
+SVar:Meld:DB$ Meld | ConditionPresent$ Card.Self+YouCtrl+YouOwn+attacking | ConditionCheckSVar$ Y | Name$ Mishra, Lost to Phyrexia | Tapped$ True | Attacking$ True | Primary$ Mishra, Claimed by Gix | Secondary$ Phyrexian Dragon Engine
 SVar:X:Count$Valid Creature.attacking+YouCtrl
+SVar:Y:Count$Valid Creature.YouCtrl+YouOwn+namedPhyrexian Dragon Engine+attacking
 SVar:PlayMain1:TRUE
 DeckHints:Name$Phyrexian Dragon Engine
 MeldPair:Phyrexian Dragon Engine

forge-gui/res/cardsfolder/w/well_laid_plans.txt

@@ -1,7 +1,7 @@
 Name:Well-Laid Plans
 ManaCost:2 U
 Types:Enchantment
-R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Creature | ValidSource$ Creature | RelativeToSource$ Creature.SharesColorWith | Description$ Prevent all damage that would be dealt to a creature by another creature if they share a color.
+R:Event$ DamageDone | ActiveZones$ Battlefield | Prevent$ True | ValidTarget$ Creature | ValidSource$ Creature.inZoneBattlefield | RelativeToSource$ Creature.SharesColorWith | Description$ Prevent all damage that would be dealt to a creature by another creature if they share a color.
 SVar:NonStackingEffect:True
 AI:RemoveDeck:Random
 Oracle:Prevent all damage that would be dealt to a creature by another creature if they share a color.

forge-gui/res/quest/duels/Baal 2.dck

@@ -1,6 +1,6 @@
 [duel]
 [metadata]
-Name=Baal
+Name=Baal 2
 Title=Baal, Lord of Destruction
 Difficulty=medium
 Description=BGR destruction and deathtouch theme

forge-gui/res/quest/duels/Baal 3.dck

@@ -1,6 +1,6 @@
 [duel]
 [metadata]
-Name=Baal
+Name=Baal 3
 Title=Baal, Lord of Destruction
 Difficulty=hard
 Description=BGR destruction and deathtouch theme

forge-gui/res/quest/duels/King_Goldemar_2.dck

@@ -1,26 +0,0 @@
-[duel]
-[metadata]
-Name=King Goldemar 2
-Title=King Goldemar
-Difficulty=medium
-Description= R/B Kobold deck with teeth deck
-Icon=King Goldemar.jpg
-Deck Type=constructed
-[main]
-4 Crimson Kobolds
-4 Crookshank Kobolds
-4 Kobolds of Kher Keep
-4 Kobold Drill Sergeant
-4 Kobold Overlord
-4 Kobold Taskmaster
-4 Rohgahh of Kher Keep
-4 Lightning Bolt
-4 Kher Keep
-4 Fiery Emancipation
-10 Mountain
-2 Swamp
-4 Blood Crypt
-4 Blackcleave Cliffs
-4 Door of Destinies
-4 Dark Ritual
-[sideboard]

forge-gui/res/quest/duels/Liliana's Unliving Hordes 2.dck

@@ -1,6 +1,6 @@
 [duel]
 [metadata]
-Name=Liliana's Unliving Hordes 1
+Name=Liliana's Unliving Hordes 2
 Title=Liliana Vess
 Difficulty=medium
 Description=Mono-black zombies and Liliana planeswalkers theme