From ccce87f3539d8200ec1bb72aa6f01ff587ac8992 Mon Sep 17 00:00:00 2001 From: Simisays <67333662+Simisays@users.noreply.github.com> Date: Tue, 30 Aug 2022 21:23:51 +0200 Subject: [PATCH] update --- .../main/java/forge/game/card/CardFactoryUtil.java | 4 ++-- .../res/cardsfolder/upcoming/champions_of_tyr.txt | 14 -------------- .../cardsfolder/upcoming/seatower_imprisonment.txt | 2 +- .../cardsfolder/upcoming/sworn_to_the_legion.txt | 2 +- .../upcoming/ulder_ravengard_marshal.txt | 6 +++--- 5 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt diff --git a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java index c68571d4268..25bcd2abb76 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -1064,10 +1064,10 @@ public class CardFactoryUtil { inst.addTrigger(dethroneTrigger); } else if (keyword.equals("Double Team")) { - final String doubleteamScript = "Mode$ Attacks | ValidCard$ Card.Self+nonToken | TriggerZones$ Battlefield | TriggerDescription$(" + inst.getReminderText() + ")"; + final String doubleteamScript = "Mode$ Attacks | ValidCard$ Card.Self+nonToken | TriggerZones$ Battlefield | TriggerDescription$ (" + inst.getReminderText() + ")"; final String makeString = "DB$ MakeCard | DefinedName$ Self | Zone$ Hand | RememberMade$ True"; final String forgetString = "DB$ Effect | Duration$ Permanent | RememberObjects$ Remembered | ImprintCards$ TriggeredAttacker | StaticAbilities$ RemoveDoubleTeamMade"; - final String madeforgetmadeString = "Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered,Card.IsImprinted | RemoveKeyword$ Double Team | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually loses Double Team"; + final String madeforgetmadeString = "Mode$ Continuous | EffectZone$ Command | Affected$ Card.IsRemembered,Card.IsImprinted | RemoveKeyword$ Double Team | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Both cards perpetually lose double team."; final String CleanupString = "DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True"; final Trigger trigger = TriggerHandler.parseTrigger(doubleteamScript, card, intrinsic); final SpellAbility youMake = AbilityFactory.getAbility(makeString, card); diff --git a/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt b/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt deleted file mode 100644 index 168f18dd25e..00000000000 --- a/forge-gui/res/cardsfolder/upcoming/champions_of_tyr.txt +++ /dev/null @@ -1,14 +0,0 @@ -Name:Champions of Tyr -ManaCost:2 W W -Types:Creature Angel Knight -PT:4/3 -K:Flying -K:Double Team -T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ DBDelayedTrigger | TriggerDescription$ When CARDNAME enters the battlefield, you get a boon with "When you cast your next creature spell, that creature enters the battlefield with your choice of a +1/+1 counter, a flying counter, or a lifelink counter on it." -SVar:DBDelayedTrigger:DB$ DelayedTrigger | Execute$ TrigAddAPI | Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerDescription$ When you cast your next creature spell, that creature enters the battlefield with an additional +1/+1 counter, trample counter, and vigilance counter on it. -SVar:TrigAddAPI:DB$ Effect | RememberObjects$ TriggeredCard | ForgetOnMoved$ Stack | ReplacementEffects$ ReplaceEnter -SVar:ReplaceEnter:Event$ Moved | ValidCard$ Card.IsRemembered | Destination$ Battlefield | ReplaceWith$ AddExtraCounter | ReplacementResult$ Updated | Description$ When you cast your next creature spell, that creature enters the battlefield with your choice of a +1/+1 counter, a flying counter, or a lifelink counter on it. -SVar:AddExtraCounter:DB$ PutCounter | ETB$ True | Defined$ ReplacedCard | CounterType$ P1P1,Flying,Lifelink | CounterNum$ 1 -SVar:DBExile:DB$ ChangeZone | Defined$ Self | Origin$ Command | Destination$ Exile -DeckHas:Ability$LifeGain|Counters -Oracle:Flying\nDouble team\nWhen Champions of Tyr enters the battlefield, you get a boon with "When you cast your next creature spell, that creature enters the battlefield with your choice of a +1/+1 counter, a flying counter, or a lifelink counter on it." \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/seatower_imprisonment.txt b/forge-gui/res/cardsfolder/upcoming/seatower_imprisonment.txt index 391897e8ff7..c49cb221f5a 100644 --- a/forge-gui/res/cardsfolder/upcoming/seatower_imprisonment.txt +++ b/forge-gui/res/cardsfolder/upcoming/seatower_imprisonment.txt @@ -2,7 +2,7 @@ Name:Seatower Imprisonment ManaCost:2 W W Types:Enchantment Aura K:Enchant creature or planeswalker you don't control -A:SP$ Attach | ValidTgts$ Creature.YouDontCtrl ,Planeswalker.YouDontCtrl | AILogic$ Curse +A:SP$ Attach | ValidTgts$ Creature.YouDontCtrl,Planeswalker.YouDontCtrl | AILogic$ Curse T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigConjure | TriggerDescription$ When CARDNAME enters the battlefield, conjure a card named Soldiers of the Watch onto the battlefield. SVar:TrigConjure:DB$ MakeCard | Name$ Soldiers of the Watch | Zone$ Battlefield S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block. & CARDNAME's activated abilities can't be activated. | Description$ Enchanted permanent can't attack or block and its activated abilities can't be activated. diff --git a/forge-gui/res/cardsfolder/upcoming/sworn_to_the_legion.txt b/forge-gui/res/cardsfolder/upcoming/sworn_to_the_legion.txt index a3e23ed1fe7..8d2dfb4b579 100644 --- a/forge-gui/res/cardsfolder/upcoming/sworn_to_the_legion.txt +++ b/forge-gui/res/cardsfolder/upcoming/sworn_to_the_legion.txt @@ -5,7 +5,7 @@ T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefi SVar:DBEffect:DB$ Effect | RememberObjects$ Valid Creature.YouCtrl+nonToken | StaticAbilities$ PerpetualDoubleTeam | Name$ Sworn to the Legion's Perpetual Effect | Duration$ Permanent SVar:PerpetualDoubleTeam:Mode$ Continuous | Affected$ Card.IsRemembered | AddKeyword$ Double Team | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ Nontoken creatures you control perpetually gain double team. T:Mode$ SpellCast | ValidCard$ Creature | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ DBEffectCast | TriggerDescription$ Whenever you cast a creature spell, it perpetually gains double team. -SVar:DBEffectCast:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualDoubleTeamCast | Name$ Sworn to the Legion's Perpetual Effect two | Duration$ Permanent +SVar:DBEffectCast:DB$ Effect | RememberObjects$ TriggeredCard | StaticAbilities$ PerpetualDoubleTeamCast | Name$ Sworn to the Legion's Perpetual Effect | Duration$ Permanent SVar:PerpetualDoubleTeamCast:Mode$ Continuous | Affected$ Card.IsRemembered | AddKeyword$ Double Team | EffectZone$ Command | AffectedZone$ Battlefield,Hand,Graveyard,Exile,Stack,Library,Command | Description$ This creature perpetually gains double team SVar:BuffedBy:Creature Oracle:When Sworn to the Legion enters the battlefield, nontoken creatures you control perpetually gain double team.\nWhenever you cast a creature spell, it perpetually gains double team. diff --git a/forge-gui/res/cardsfolder/upcoming/ulder_ravengard_marshal.txt b/forge-gui/res/cardsfolder/upcoming/ulder_ravengard_marshal.txt index adf81a8e73f..18d3f2d8a8b 100644 --- a/forge-gui/res/cardsfolder/upcoming/ulder_ravengard_marshal.txt +++ b/forge-gui/res/cardsfolder/upcoming/ulder_ravengard_marshal.txt @@ -3,9 +3,9 @@ ManaCost:1 R W Types:Legendary Creature Human Noble Soldier PT:3/3 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPumpEOT | TriggerDescription$ When CARDNAME enters the battlefield, another target nontoken creature you control gains double team until end of turn. -SVar:TrigPumpEOT:DB$ Pump | ValidTgts$ Creature.YouCtrl+nonToken+Other | TgtPrompt$ Select another target nontoken creature | KW$ Double Team -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever CARDNAME attacks, conjure a duplicate of another target nontoken attacking creature into your hand. +SVar:TrigPumpEOT:DB$ Pump | ValidTgts$ Creature.YouCtrl+nonToken+Other | TgtPrompt$ Select another target nontoken creature you control | KW$ Double Team +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever NICKNAME attacks, conjure a duplicate of another target nontoken attacking creature into your hand. SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.attacking+Other+nonToken | TgtPrompt$ Select another target nontoken creature that is attacking | SubAbility$ DBMakeCard -SVar:DBMakeCard:DB$ MakeCard | DefinedName$ ChosenCard | Zone$ Hand +SVar:DBMakeCard:DB$ MakeCard | DefinedName$ Targeted | Zone$ Hand SVar:HasAttackEffect:TRUE Oracle:When Ulder Ravengard, Marshal enters the battlefield, another target nontoken creature you control gains double team until end of turn.\nWhenever Ulder Ravengard attacks, conjure a duplicate of another target nontoken attacking creature into your hand.