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 1a359265886..34b0c5b2672 100644 --- a/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java +++ b/forge-game/src/main/java/forge/game/card/CardFactoryUtil.java @@ -800,7 +800,7 @@ public class CardFactoryUtil { final List powers = Lists.newArrayList(); final String restriction = l[0].substring(15); final String[] rest = restriction.split(","); - CardCollection list = CardLists.getValidCards(cc.getGame().getCardsInGame(), rest, cc, c, null); + CardCollection list = CardLists.getValidCards(cc.getGame().getCardsIn(ZoneType.Battlefield), rest, cc, c, null); for (final Card card : list) { Integer pow = card.getNetPower(); if (!powers.contains(pow)) { diff --git a/forge-gui/res/cardsfolder/upcoming/eager_first_year.txt b/forge-gui/res/cardsfolder/upcoming/eager_first_year.txt index da870fd31e1..b207d690012 100644 --- a/forge-gui/res/cardsfolder/upcoming/eager_first_year.txt +++ b/forge-gui/res/cardsfolder/upcoming/eager_first_year.txt @@ -1,5 +1,5 @@ Name:Eager First-Year -ManaCost:2 U R +ManaCost:1 W Types:Creature Human Wizard PT:2/2 T:Mode$ SpellCastOrCopy | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Magecraft - Whenever you cast or copy an instant or sorcery spell, CARDNAME gets +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt b/forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt index e71cdfc0b06..a82e176f518 100644 --- a/forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt +++ b/forge-gui/res/cardsfolder/upcoming/flamescroll_celebrant_revel_in_silence.txt @@ -13,8 +13,8 @@ ALTERNATE Name:Revel in Silence ManaCost:W W Types:Instant -A:SP$ Effect | Cost$ W | Name$ Silence Effect | StaticAbilities$ STCantBeCast,STCantBeActivated | AILogic$ BeginningOfOppTurn | SubAbility$ DBChange | SpellDescription$ Your opponents can't cast spells or activate planeswalkers' loyalty abilities this turn. -SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ Exile CARDNAME +A:SP$ Effect | Cost$ W | Name$ Silence Effect | StaticAbilities$ STCantBeCast,STCantBeActivated | AILogic$ BeginningOfOppTurn | SubAbility$ DBChange | StackDescription$ SpellDescription | SpellDescription$ Your opponents can't cast spells or activate planeswalkers' loyalty abilities this turn. Exile CARDNAME. +SVar:DBChange:DB$ ChangeZone | Origin$ Stack | Destination$ Exile | StackDescription$ None SVar:STCantBeCast:Mode$ CantBeCast | EffectZone$ Command | ValidCard$ Card | Caster$ Opponent | Description$ Your opponents can't cast spells. SVar:STCantBeActivated:Mode$ CantBeActivated | Activator$ Opponent | EffectZone$ Command | ValidCard$ Planeswalker | Loyalty$ True | Description$ Your opponents can't activate planeswalkers' loyalty abilities. -Oracle:Your opponents can't cast spells this turn. (Spells cast before this resolves are unaffected.) +Oracle:You opponents can’t cast spells or activate planeswalkers’ loyalty abilities this turn.\nExile Revel in Silence. \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/rowan_scholar_of_sparks_will_scholar_of_frost.txt b/forge-gui/res/cardsfolder/upcoming/rowan_scholar_of_sparks_will_scholar_of_frost.txt index a72611fd348..3c8784d0098 100644 --- a/forge-gui/res/cardsfolder/upcoming/rowan_scholar_of_sparks_will_scholar_of_frost.txt +++ b/forge-gui/res/cardsfolder/upcoming/rowan_scholar_of_sparks_will_scholar_of_frost.txt @@ -6,7 +6,7 @@ S:Mode$ ReduceCost | ValidCard$ Instant,Sorcery | Type$ Spell | Activator$ You | A:AB$ DealDamage | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | Defined$ Player.Opponent | NumDmg$ X | SpellDescription$ CARDNAME deals 1 damage to each opponent. If you've drawn three or more cards this turn, she deals 3 damage to each opponent instead. SVar:X:Count$Compare Y GE3.3.1 SVar:Y:Count$YouDrewThisTurn -A:AB$ Effect | Cost$ SubCounter<4/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Rowan, Scholar of Sparks | Triggers$ TRCast | SVars$ TrigCopy | SpellDescription$ You get an emblem with "Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy." +A:AB$ Effect | Cost$ SubCounter<4/LOYALTY> | Planeswalker$ True | Ultimate$ True | Name$ Emblem - Rowan, Scholar of Sparks | Triggers$ TRCast | Duration$ Permanent | SpellDescription$ You get an emblem with "Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy." SVar:TRCast:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Command | Execute$ TrigCopy | TriggerDescription$ Whenever you cast an instant or sorcery spell, you may pay {2}. If you do, copy that spell. You may choose new targets for the copy. SVar:TrigCopy:AB$ CopySpellAbility | Cost$ 2 | Defined$ TriggeredSpellAbility | AILogic$ AlwaysIfViable | MayChooseTarget$ True AlternateMode:Modal