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

Merge branch 'svarupdate' into 'master'

Browse Source 
Update Svar->SVar.

See merge request core-developers/forge!950
This commit is contained in:
Michael Kamensky
2018-09-26 10:24:56 +00:00
parent 0663024acf 0e398d2589
commit b125dd9e2d
5 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-core/src/main/java/forge/card/CardRules.java
View File

@@ -453,8 +453,6 @@ public final class CardRules implements ICardCharacteristics {
this.removedFromRandomDecks = "True".equalsIgnoreCase(value); this.removedFromRandomDecks = "True".equalsIgnoreCase(value);
} else if ( "Picture".equals(variable) ) { } else if ( "Picture".equals(variable) ) {
this.pictureUrl[this.curFace] = value; this.pictureUrl[this.curFace] = value;
} else if ( "Rarity".equals(variable) ) {
// discard that, they should supply it in SetInfo
} else } else
this.faces[curFace].addSVar(variable, value); this.faces[curFace].addSVar(variable, value);
} else if ("SetInfo".equals(key)) { } else if ("SetInfo".equals(key)) {

1
forge-gui/res/cardsfolder/m/michiko_konda_truth_seeker.txt
View File

@@ -4,6 +4,5 @@ Types:Legendary Creature Human Advisor
PT:2/2 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. 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: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 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. Oracle:Whenever a source an opponent controls deals damage to you, that player sacrifices a permanent.

1
forge-gui/res/cardsfolder/r/retaliator_griffin.txt
View File

@@ -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. 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:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X | References$ X
SVar:X:TriggerCount$DamageAmount SVar:X:TriggerCount$DamageAmount
Svar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/retaliator_griffin.jpg 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. Oracle:Flying\nWhenever a source an opponent controls deals damage to you, you may put that many +1/+1 counters on Retaliator Griffin.

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

@@ -9,6 +9,6 @@ SVar:X:Remembered$Amount
SVar:Y:Count$Valid Creature.YouCtrl SVar:Y:Count$Valid Creature.YouCtrl
SVar:Z:Count$Valid Creature.OppCtrl SVar:Z:Count$Valid Creature.OppCtrl
SVar:NeedsToPlayVar:Y GTZ SVar:NeedsToPlayVar:Y GTZ
Svar:RemAIDeck:True SVar:RemAIDeck:True
SVar:Picture:http://www.wizards.com/global/images/magic/general/standstill.jpg 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. Oracle:When a player casts a spell, sacrifice Standstill. If you do, each of that player's opponents draws three cards.

1
forge-gui/res/cardsfolder/t/tamanoa.txt
View File

@@ -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. 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:TrigGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggerCount$DamageAmount SVar:X:TriggerCount$DamageAmount
Svar:Rarity:Rare
SVar:Picture:http://www.wizards.com/global/images/magic/general/tamanoa.jpg 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. Oracle:Whenever a noncreature source you control deals damage, you gain that much life.