From d273a35305b043c3d223fad2f6a5e0c7c373da17 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 26 Sep 2018 09:16:34 +0300 Subject: [PATCH 1/2] - Update Svar->SVar. --- forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt | 2 +- forge-gui/res/cardsfolder/r/retaliator_griffin.txt | 2 +- forge-gui/res/cardsfolder/s/standstill.txt | 2 +- forge-gui/res/cardsfolder/t/tamanoa.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt b/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt index 8b7e34ff4f7..8abf81b05be 100644 --- a/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt +++ b/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt @@ -4,6 +4,6 @@ Types:Legendary Creature Human Advisor PT:2/2 T:Mode$ DamageDone | ValidSource$ Card.OppCtrl | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a source an opponent controls deals damage to you, that player sacrifices a permanent. SVar:TrigSac:DB$Sacrifice | Defined$ TriggeredSourceController | SacValid$ Permanent -Svar:Rarity:Rare +SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/michiko_konda_truth_seeker.jpg Oracle:Whenever a source an opponent controls deals damage to you, that player sacrifices a permanent. diff --git a/forge-gui/res/cardsfolder/r/retaliator_griffin.txt b/forge-gui/res/cardsfolder/r/retaliator_griffin.txt index ceb70260099..b8865aa8a43 100644 --- a/forge-gui/res/cardsfolder/r/retaliator_griffin.txt +++ b/forge-gui/res/cardsfolder/r/retaliator_griffin.txt @@ -6,6 +6,6 @@ K:Flying T:Mode$ DamageDone | ValidSource$ Card.OppCtrl | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever a source an opponent controls deals damage to you, you may put that many +1/+1 counters on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X SVar:X:TriggerCount$DamageAmount -Svar:Rarity:Rare +SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/retaliator_griffin.jpg Oracle:Flying\nWhenever a source an opponent controls deals damage to you, you may put that many +1/+1 counters on Retaliator Griffin. diff --git a/forge-gui/res/cardsfolder/s/standstill.txt b/forge-gui/res/cardsfolder/s/standstill.txt index 005ad59d316..8236863e08b 100644 --- a/forge-gui/res/cardsfolder/s/standstill.txt +++ b/forge-gui/res/cardsfolder/s/standstill.txt @@ -9,6 +9,6 @@ SVar:X:Remembered$Amount SVar:Y:Count$Valid Creature.YouCtrl SVar:Z:Count$Valid Creature.OppCtrl SVar:NeedsToPlayVar:Y GTZ -Svar:RemAIDeck:True +SVar:RemAIDeck:True SVar:Picture:http://www.wizards.com/global/images/magic/general/standstill.jpg Oracle:When a player casts a spell, sacrifice Standstill. If you do, each of that player's opponents draws three cards. diff --git a/forge-gui/res/cardsfolder/t/tamanoa.txt b/forge-gui/res/cardsfolder/t/tamanoa.txt index 013368baacf..d882871571e 100644 --- a/forge-gui/res/cardsfolder/t/tamanoa.txt +++ b/forge-gui/res/cardsfolder/t/tamanoa.txt @@ -5,6 +5,6 @@ PT:2/4 T:Mode$ DamageDealtOnce | ValidSource$ Card.nonCreature+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a noncreature source you control deals damage, you gain that much life. SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X SVar:X:TriggerCount$DamageAmount -Svar:Rarity:Rare +SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/tamanoa.jpg Oracle:Whenever a noncreature source you control deals damage, you gain that much life. From 0e398d2589ed48e85e4a0aee0abffbfdaa92bea0 Mon Sep 17 00:00:00 2001 From: Agetian Date: Wed, 26 Sep 2018 13:21:46 +0300 Subject: [PATCH 2/2] - Removing SVar:Rarity:Rare --- forge-core/src/main/java/forge/card/CardRules.java | 2 -- forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt | 1 - forge-gui/res/cardsfolder/r/retaliator_griffin.txt | 1 - forge-gui/res/cardsfolder/t/tamanoa.txt | 1 - 4 files changed, 5 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardRules.java b/forge-core/src/main/java/forge/card/CardRules.java index f96411d4dc7..93f6e3e5f78 100644 --- a/forge-core/src/main/java/forge/card/CardRules.java +++ b/forge-core/src/main/java/forge/card/CardRules.java @@ -453,8 +453,6 @@ public final class CardRules implements ICardCharacteristics { this.removedFromRandomDecks = "True".equalsIgnoreCase(value); } else if ( "Picture".equals(variable) ) { this.pictureUrl[this.curFace] = value; - } else if ( "Rarity".equals(variable) ) { - // discard that, they should supply it in SetInfo } else this.faces[curFace].addSVar(variable, value); } else if ("SetInfo".equals(key)) { diff --git a/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt b/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt index 8abf81b05be..91727132aff 100644 --- a/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt +++ b/forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt @@ -4,6 +4,5 @@ Types:Legendary Creature Human Advisor PT:2/2 T:Mode$ DamageDone | ValidSource$ Card.OppCtrl | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ Whenever a source an opponent controls deals damage to you, that player sacrifices a permanent. SVar:TrigSac:DB$Sacrifice | Defined$ TriggeredSourceController | SacValid$ Permanent -SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/michiko_konda_truth_seeker.jpg Oracle:Whenever a source an opponent controls deals damage to you, that player sacrifices a permanent. diff --git a/forge-gui/res/cardsfolder/r/retaliator_griffin.txt b/forge-gui/res/cardsfolder/r/retaliator_griffin.txt index b8865aa8a43..e4111734bbc 100644 --- a/forge-gui/res/cardsfolder/r/retaliator_griffin.txt +++ b/forge-gui/res/cardsfolder/r/retaliator_griffin.txt @@ -6,6 +6,5 @@ K:Flying T:Mode$ DamageDone | ValidSource$ Card.OppCtrl | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | OptionalDecider$ You | TriggerDescription$ Whenever a source an opponent controls deals damage to you, you may put that many +1/+1 counters on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X SVar:X:TriggerCount$DamageAmount -SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/retaliator_griffin.jpg Oracle:Flying\nWhenever a source an opponent controls deals damage to you, you may put that many +1/+1 counters on Retaliator Griffin. diff --git a/forge-gui/res/cardsfolder/t/tamanoa.txt b/forge-gui/res/cardsfolder/t/tamanoa.txt index d882871571e..d164f782778 100644 --- a/forge-gui/res/cardsfolder/t/tamanoa.txt +++ b/forge-gui/res/cardsfolder/t/tamanoa.txt @@ -5,6 +5,5 @@ PT:2/4 T:Mode$ DamageDealtOnce | ValidSource$ Card.nonCreature+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a noncreature source you control deals damage, you gain that much life. SVar:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X SVar:X:TriggerCount$DamageAmount -SVar:Rarity:Rare SVar:Picture:http://www.wizards.com/global/images/magic/general/tamanoa.jpg Oracle:Whenever a noncreature source you control deals damage, you gain that much life.