diff --git a/forge-game/src/main/java/forge/game/zone/MagicStack.java b/forge-game/src/main/java/forge/game/zone/MagicStack.java index 3a62527f307..ee44c3aca15 100644 --- a/forge-game/src/main/java/forge/game/zone/MagicStack.java +++ b/forge-game/src/main/java/forge/game/zone/MagicStack.java @@ -954,8 +954,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable chosenTargets) - { + static protected boolean commitCrimeCheck(Player p, Iterable chosenTargets) { List zoneList = ImmutableList.of(ZoneType.Battlefield, ZoneType.Graveyard, ZoneType.Stack); for (TargetChoices tc : chosenTargets) { diff --git a/forge-gui/res/cardsfolder/a/asmira_holy_avenger.txt b/forge-gui/res/cardsfolder/a/asmira_holy_avenger.txt index fb97f55afc8..0a4e6d89bb4 100644 --- a/forge-gui/res/cardsfolder/a/asmira_holy_avenger.txt +++ b/forge-gui/res/cardsfolder/a/asmira_holy_avenger.txt @@ -3,7 +3,7 @@ ManaCost:2 G W Types:Legendary Creature Human Cleric PT:2/3 K:Flying -T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, put a +1/+1 counter on Asmira, Holy Avenger for each creature put into your graveyard from the battlefield this turn. +T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of each end step, put a +1/+1 counter on CARDNAME for each creature put into your graveyard from the battlefield this turn. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ X SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature.YouOwn Oracle:Flying\nAt the beginning of each end step, put a +1/+1 counter on Asmira, Holy Avenger for each creature put into your graveyard from the battlefield this turn. diff --git a/forge-gui/res/cardsfolder/g/golden_argosy.txt b/forge-gui/res/cardsfolder/g/golden_argosy.txt index eeea286bd13..f20efe1caa4 100644 --- a/forge-gui/res/cardsfolder/g/golden_argosy.txt +++ b/forge-gui/res/cardsfolder/g/golden_argosy.txt @@ -6,8 +6,6 @@ T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tr SVar:TrigFlicker:DB$ ChangeZoneAll | ChangeType$ Creature.CrewedThisTurn | Origin$ Battlefield | Destination$ Exile | RememberLKI$ True | SubAbility$ DelTrig SVar:DelTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ End of Turn | Execute$ TrigReturn | RememberObjects$ RememberedLKI | SubAbility$ DBCleanup | TriggerDescription$ Return them to the battlefield tapped under their owner's control at the beginning of the next end step. SVar:TrigReturn:DB$ ChangeZone | Origin$ Exile | Destination$ Battlefield | Defined$ DelayTriggerRemembered | Tapped$ True -T:Mode$ Phase | Phase$ End of Turn | Static$ True | Execute$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True K:Crew:1 SVar:HasAttackEffect:TRUE Oracle:Whenever Golden Argosy attacks, exile each creature that crewed it this turn. Return them to the battlefield tapped under their owner's control at the beginning of the next end step.\nCrew 1 (Tap any number of creatures you control with total power 1 or more: This Vehicle becomes an artifact creature until end of turn.) diff --git a/forge-gui/res/cardsfolder/g/grim_reapers_sprint.txt b/forge-gui/res/cardsfolder/g/grim_reapers_sprint.txt index 18e49685393..18a2b915c56 100644 --- a/forge-gui/res/cardsfolder/g/grim_reapers_sprint.txt +++ b/forge-gui/res/cardsfolder/g/grim_reapers_sprint.txt @@ -6,7 +6,7 @@ S:Mode$ ReduceCost | ValidCard$ Card.Self | Type$ Spell | Amount$ 3 | EffectZone A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigUntap | TriggerDescription$ When CARDNAME enters the battlefield, untap each creature you control. If it's your main phase, there is an additional combat phase after this phase. SVar:TrigUntap:DB$ UntapAll | ValidCards$ Creature.YouCtrl | SubAbility$ DBAddCombat -SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ Combat | ConditionPhases$ Main1,Main2 +SVar:DBAddCombat:DB$ AddPhase | ExtraPhase$ Combat | ConditionPhases$ Main1,Main2 | ConditionPlayerTurn$ True S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Haste | Description$ Enchanted creature gets +2/+2 and has haste. SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Creature DeckHints:Ability$Sacrifice diff --git a/forge-gui/res/cardsfolder/n/nahiri_the_unforgiving.txt b/forge-gui/res/cardsfolder/n/nahiri_the_unforgiving.txt index 0f3c86f41e4..ac8a0cba45f 100644 --- a/forge-gui/res/cardsfolder/n/nahiri_the_unforgiving.txt +++ b/forge-gui/res/cardsfolder/n/nahiri_the_unforgiving.txt @@ -5,8 +5,8 @@ Loyalty:5 K:Compleated A:AB$ Effect | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 1 | RememberObjects$ Targeted | ExileOnMoved$ Battlefield | Duration$ UntilYourNextTurn | StaticAbilities$ MustAttack | SpellDescription$ Until your next turn, up to one target creature attacks a player each combat if able. SVar:MustAttack:Mode$ MustAttack | MustAttack$ Player | ValidCreature$ Card.IsRemembered | Description$ This creature attacks this turn if able. -A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. -SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose +A:AB$ Discard | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Mode$ TgtChoose | SubAbility$ DBDraw | SpellDescription$ Discard a card, then draw a card. +SVar:DBDraw:DB$ Draw A:AB$ ChangeZone | Cost$ AddCounter<0/LOYALTY> | Planeswalker$ True | SubAbility$ DBCopy | Origin$ Graveyard | RememberChanged$ True | Destination$ Exile | TgtPrompt$ Select target creature or equipment in your graveyard | ValidTgts$ Creature.YouCtrl+cmcLTX,Equipment.YouCtrl+cmcLTX | SpellDescription$ Exile target creature or Equipment card with mana value less than NICKNAME's loyalty from your graveyard. Create a token that's a copy of it. That token gains haste. Exile it at the beginning of the next end step. SVar:DBCopy:DB$ CopyPermanent | Defined$ Remembered | PumpKeywords$ Haste | AtEOT$ Exile | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True diff --git a/forge-gui/res/cardsfolder/n/nahiris_sacrifice.txt b/forge-gui/res/cardsfolder/n/nahiris_sacrifice.txt index b36754c7462..68e9a81f8fc 100644 --- a/forge-gui/res/cardsfolder/n/nahiris_sacrifice.txt +++ b/forge-gui/res/cardsfolder/n/nahiris_sacrifice.txt @@ -5,5 +5,5 @@ A:SP$ DealDamage | Cost$ 1 R Sac<1/Creature.cmcEQX;Artifact.cmcEQX/artifact or c SVar:MaxTgts:Count$Valid Creature SVar:AIPreference:SacCost$Creature,Artifact #X needs to be set this way to allow cost checks to pass - will be overwritten by Announce -SVar:X:Count$Valid Permanent.YouCtrl$GreatestCMC +SVar:X:Count$Valid Creature.YouCtrl,Artifact.YouCtrl$GreatestCMC Oracle:As an additional cost to cast this spell, sacrifice an artifact or creature with mana value X.\nNahiri's Sacrifice deals X damage divided as you choose among any number of target creatures. diff --git a/forge-gui/res/cardsfolder/upcoming/final_showdown.txt b/forge-gui/res/cardsfolder/upcoming/final_showdown.txt index ecc8b95b6c0..cd31cb1955b 100644 --- a/forge-gui/res/cardsfolder/upcoming/final_showdown.txt +++ b/forge-gui/res/cardsfolder/upcoming/final_showdown.txt @@ -4,7 +4,7 @@ Types:Instant K:Spree A:SP$ Charm | Choices$ DBDebuffAll,DBChooseCard,DBDestroyAll | MinCharmNum$ 1 | CharmNum$ 3 | Spree$ True SVar:DBDebuffAll:DB$ AnimateAll | SpreeCost$ 1 | ValidCards$ Creature | RemoveAllAbilities$ True | SpellDescription$ All creatures lose all abilities until end of turn. -SVar:DBChooseCard:DB$ ChooseCard | SpreeCost$ 1 | Choices$ Creature.YouCtrl | ChoiceTitle$ Choose a creature you control | SubAbility$ DBPump | SpellDescription$ Choose a creature you control. It gains indestructible until end of turn. +SVar:DBChooseCard:DB$ ChooseCard | SpreeCost$ 1 | Choices$ Creature.YouCtrl | Mandatory$ True | ChoiceTitle$ Choose a creature you control | SubAbility$ DBPump | SpellDescription$ Choose a creature you control. It gains indestructible until end of turn. SVar:DBPump:DB$ Pump | Defined$ ChosenCard | KW$ Indestructible SVar:DBDestroyAll:DB$ DestroyAll | ValidCards$ Creature | SpreeCost$ 3 W W | SpellDescription$ Destroy all creatures. Oracle:Spree (Choose one or more additional costs.)\n+ {1} — All creatures lose all abilities until end of turn.\n+ {1} — Choose a creature you control. It gains indestructible until end of turn.\n+ {3}{W}{W} — Destroy all creatures. diff --git a/forge-gui/res/cardsfolder/upcoming/jace_reawakened.txt b/forge-gui/res/cardsfolder/upcoming/jace_reawakened.txt index a54a645350b..6237bba5015 100644 --- a/forge-gui/res/cardsfolder/upcoming/jace_reawakened.txt +++ b/forge-gui/res/cardsfolder/upcoming/jace_reawakened.txt @@ -2,7 +2,7 @@ Name:Jace Reawakened ManaCost:U U Types:Legendary Planeswalker Jace Loyalty:3 -S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | CheckSVar$ Count$YourTurns | SVarCompare$ LE3 | Description$ You can't cast this spell during your first, second, or third turns of the game. +S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | Caster$ Player.Active | CheckSVar$ Count$YourTurns | SVarCompare$ LE3 | Description$ You can't cast this spell during your first, second, or third turns of the game. A:AB$ Draw | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | SubAbility$ DBDiscard | SpellDescription$ Draw a card, then discard a card. SVar:DBDiscard:DB$ Discard | Mode$ TgtChoose A:AB$ ChangeZone | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Origin$ Hand | Destination$ Exile | ChangeType$ Card.nonLand+cmcLE3 | RememberChanged$ True | SubAbility$ DBPlot | StackDescription$ SpellDescription | SpellDescription$ You may exile a nonland card with mana value 3 or less from your hand. diff --git a/forge-gui/res/cardsfolder/upcoming/kraum_violent_cacophony b/forge-gui/res/cardsfolder/upcoming/kraum_violent_cacophony.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kraum_violent_cacophony rename to forge-gui/res/cardsfolder/upcoming/kraum_violent_cacophony.txt