From 0ae7ac1376329652ea76ae074285b83f481a57cb Mon Sep 17 00:00:00 2001 From: swordshine Date: Fri, 28 Oct 2016 11:06:22 +0000 Subject: [PATCH] - C16: Add 6 cards by Marek14 --- .gitattributes | 6 ++++++ .../forge/game/staticability/StaticAbility.java | 4 ++-- .../g/guardian_of_the_great_conduit.txt | 2 +- .../res/cardsfolder/i/inventors_apprentice.txt | 2 +- .../res/cardsfolder/r/renegade_firebrand.txt | 2 +- .../upcoming/breya_etherium_shaper.txt | 12 ++++++++++++ .../cardsfolder/upcoming/charging_cinderhorn.txt | 16 ++++++++++++++++ .../res/cardsfolder/upcoming/coastal_breach.txt | 7 +++++++ .../cardsfolder/upcoming/conquerors_flail.txt | 9 +++++++++ .../upcoming/saskia_the_unyielding.txt | 14 ++++++++++++++ .../cardsfolder/upcoming/stonehoof_chieftain.txt | 11 +++++++++++ 11 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 forge-gui/res/cardsfolder/upcoming/breya_etherium_shaper.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/charging_cinderhorn.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/coastal_breach.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/conquerors_flail.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/saskia_the_unyielding.txt create mode 100644 forge-gui/res/cardsfolder/upcoming/stonehoof_chieftain.txt diff --git a/.gitattributes b/.gitattributes index a7d3dda41e0..1f7e152406c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16444,9 +16444,15 @@ forge-gui/res/cardsfolder/u/utvara_hellkite.txt -text forge-gui/res/cardsfolder/u/utvara_scalper.txt svneol=native#text/plain forge-gui/res/cardsfolder/u/uyo_silent_prophet.txt svneol=native#text/plain forge-gui/res/cardsfolder/upcoming/atraxa_praetors_voice.txt -text +forge-gui/res/cardsfolder/upcoming/breya_etherium_shaper.txt -text +forge-gui/res/cardsfolder/upcoming/charging_cinderhorn.txt -text +forge-gui/res/cardsfolder/upcoming/coastal_breach.txt -text +forge-gui/res/cardsfolder/upcoming/conquerors_flail.txt -text forge-gui/res/cardsfolder/upcoming/grave_upheaval.txt -text forge-gui/res/cardsfolder/upcoming/primeval_protector.txt -text forge-gui/res/cardsfolder/upcoming/prismatic_geoscope.txt -text +forge-gui/res/cardsfolder/upcoming/saskia_the_unyielding.txt -text +forge-gui/res/cardsfolder/upcoming/stonehoof_chieftain.txt -text forge-gui/res/cardsfolder/upcoming/sublime_exhalation.txt -text forge-gui/res/cardsfolder/upcoming/sylvan_reclamation.txt -text forge-gui/res/cardsfolder/v/vacuumelt.txt svneol=native#text/plain diff --git a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java index 7e1a7636db9..53331de0764 100644 --- a/forge-game/src/main/java/forge/game/staticability/StaticAbility.java +++ b/forge-game/src/main/java/forge/game/staticability/StaticAbility.java @@ -522,11 +522,11 @@ public class StaticAbility extends CardTraitBase implements Comparable | Choices$ DBDealDamage,DBPump,DBGainLife | Defined$ You | SpellDescription$ Choose one - CARDNAME deals 3 damage to target player; Target creature gets -4/-4 until end of turn; You gain 5 life. +SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target player. +SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -4 | NumDef$ -4 | IsCurse$ True | SpellDescription$ Target creature gets -4/-4 until end of turn +SVar:DBGainLife:DB$ GainLife | LifeAmount$ 5 | Defined$ You | SpellDescription$ You gain 5 life. +SVar:Picture:http://www.wizards.com/global/images/magic/general/breya_etherium_shaper.jpg +Oracle:When Breya, Etherium Shaper enters the battlefield, create two 1/1 blue Thopter artifact creature tokens with flying.\n{2}, Sacrifice two artifacts: Choose one -\n• Breya deals 3 damage to target player.\n• Target creature gets -4/-4 until end of turn.\n• You gain 5 life. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/charging_cinderhorn.txt b/forge-gui/res/cardsfolder/upcoming/charging_cinderhorn.txt new file mode 100644 index 00000000000..5b2701796d9 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/charging_cinderhorn.txt @@ -0,0 +1,16 @@ +Name:Charging Cinderhorn +ManaCost:3 R +Types:Creature Elemental Ox +PT:4/2 +K:Haste +T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | CheckSVar$ AttackedThisTurn | References$ AttackedThisTurn | SVarCompare$ EQ0 | TriggerDescription$ At the beginning of each player's end step, if no creatures attacked this turn, put a fury counter on CARDNAME. Then CARDNAME deals damage equal to the number of fury counters on it to that player. +SVar:TrigPutCounter:AB$ PutCounter | Cost$ 0 | Defined$ Self | CounterType$ FURY | CounterNum$ 1 | SubAbility$ DBDealDamage +SVar:DBDealDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ X | References$ X +SVar:X:Count$CardCounters.FURY +T:Mode$ AttackersDeclared | Execute$ TrigStoreSVar | Static$ True +SVar:TrigStoreSVar:DB$ StoreSVar | SVar$ AttackedThisTurn | Type$ Number | Expression$ 1 +SVar:AttackedThisTurn:Number$0 +T:Mode$ Phase | Phase$ Cleanup | Execute$ TrigReset | Static$ True +SVar:TrigReset:DB$ StoreSVar | SVar$ AttackedThisTurn | Type$ Number | Expression$ 0 +SVar:Picture:http://www.wizards.com/global/images/magic/general/charging_cinderhorn.jpg +Oracle:At the beginning of each player's end step, if no creatures attacked this turn, put a fury counter on Charging Cinderhorn. Then Charging Cinderhorn deals damage equal to the number of fury counters on it to that player. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/coastal_breach.txt b/forge-gui/res/cardsfolder/upcoming/coastal_breach.txt new file mode 100644 index 00000000000..75c961dc47e --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/coastal_breach.txt @@ -0,0 +1,7 @@ +Name:Coastal Breach +ManaCost:6 U +Types:Sorcery +K:Undaunted +A:SP$ ChangeZoneAll | Cost$ 6 U | ChangeType$ Permanent.nonLand | Origin$ Battlefield | Destination$ Hand | SpellDescription$ Return all nonland permanents to their owners' hands. +SVar:Picture:http://www.wizards.com/global/images/magic/general/coastal_breach.jpg +Oracle:Undaunted (This spell costs {1} less to cast for each opponent.)\nReturn all nonland permanents to their owners' hands. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/conquerors_flail.txt b/forge-gui/res/cardsfolder/upcoming/conquerors_flail.txt new file mode 100644 index 00000000000..85c2ff0b05a --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/conquerors_flail.txt @@ -0,0 +1,9 @@ +Name:Conqueror's Flail +ManaCost:2 +Types:Artifact Equipment +S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ X | AddToughness$ X | References$ X | Description$ Equipped creature gets +1/+1 for each color among permanents you control. +S:Mode$ CantBeCast | ValidCard$ Card | Condition$ PlayerTurn | Caster$ Opponent | IsPresent$ Card.Self+AttachedTo Creature | Description$ As long as Conqueror's Flail is attached to a creature, your opponents can't cast spells during your turn. +SVar:X:Count$ColorsCtrl +K:Equip 2 +SVar:Picture:http://www.wizards.com/global/images/magic/general/conquerors_flail.jpg +Oracle:Equipped creature gets +1/+1 for each color among permanents you control.\nAs long as Conqueror's Flail is attached to a creature, your opponents can't cast spells during your turn.\nEquip {2} diff --git a/forge-gui/res/cardsfolder/upcoming/saskia_the_unyielding.txt b/forge-gui/res/cardsfolder/upcoming/saskia_the_unyielding.txt new file mode 100644 index 00000000000..857590ef35c --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/saskia_the_unyielding.txt @@ -0,0 +1,14 @@ +Name:Saskia the Unyielding +ManaCost:B R G W +Types:Legendary Creature Human Soldier +PT:3/4 +K:Vigilance +K:Haste +K:ETBReplacement:Other:ChooseP +SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player | AILogic$ Curse | SpellDescription$ As CARDNAME enters the battlefield, choose a player. +T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever a creature you control deals combat damage to a player, it deals that much damage to the chosen player. +SVar:TrigDamage:AB$ DealDamage | Cost$ 0 | DamageSource$ TriggeredSource | NumDmg$ X | References$ X | Defined$ ChosenPlayer +SVar:X:TriggerCount$DamageAmount +SVar:HasCombatEffect:TRUE +SVar:Picture:http://www.wizards.com/global/images/magic/general/saskia_the_unyielding.jpg +Oracle:Vigilance, haste\nAs Saskia the Unyielding enters the battlefield, choose a player.\nWhenever a creature you control deals combat damage to a player, it deals that much damage to the chosen player. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/stonehoof_chieftain.txt b/forge-gui/res/cardsfolder/upcoming/stonehoof_chieftain.txt new file mode 100644 index 00000000000..681b475d58c --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/stonehoof_chieftain.txt @@ -0,0 +1,11 @@ +Name:Stonehoof Chieftain +ManaCost:7 G +Types:Creature Centaur Warrior +PT:8/8 +K:Trample +K:Indestructible +T:Mode$ Attacks | ValidCard$ Creature.YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever another creature you control attacks, it gains trample and indestructible until end of turn. +SVar:TrigPump:AB$ Pump | Cost$ 0 | Defined$ TriggeredAttacker | KW$ Trample & Indestructible +SVar:PlayMain1:TRUE +SVar:Picture:http://www.wizards.com/global/images/magic/general/stonehoof_chieftain.jpg +Oracle:Trample, indestructible\nWhenever another creature you control attacks, it gains trample and indestructible until end of turn. \ No newline at end of file