diff --git a/forge-game/src/main/java/forge/game/ability/effects/IncubateEffect.java b/forge-game/src/main/java/forge/game/ability/effects/IncubateEffect.java index 15358d80fa6..72a406df86f 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/IncubateEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/IncubateEffect.java @@ -36,27 +36,27 @@ public class IncubateEffect extends TokenEffectBase { final Card card = sa.getHostCard(); final Game game = card.getGame(); final Player activator = sa.getActivatingPlayer(); - final String amtString = sa.getParamOrDefault("Amount", "1"); final int times = AbilityUtils.calculateAmount(card, sa.getParamOrDefault("Times", "1"), sa); - // create incubator token - CardZoneTable triggerList = new CardZoneTable(); - MutableBoolean combatChanged = new MutableBoolean(false); - sa.putParam("WithCountersType", "P1P1"); - sa.putParam("WithCountersAmount", amtString); + sa.putParam("WithCountersAmount", sa.getParamOrDefault("Amount", "1")); - makeTokenTable(makeTokenTableInternal(activator, "incubator", times, sa), false, - triggerList, combatChanged, sa); + for (int i = 0; i < times; i++) { + CardZoneTable triggerList = new CardZoneTable(); + MutableBoolean combatChanged = new MutableBoolean(false); - triggerList.triggerChangesZoneAll(game, sa); - triggerList.clear(); + makeTokenTable(makeTokenTableInternal(activator, "incubator_c_0_0_a_phyrexian", 1, sa), false, + triggerList, combatChanged, sa); - game.fireEvent(new GameEventTokenCreated()); + triggerList.triggerChangesZoneAll(game, sa); + triggerList.clear(); - if (combatChanged.isTrue()) { - game.updateCombatForView(); - game.fireEvent(new GameEventCombatChanged()); + game.fireEvent(new GameEventTokenCreated()); + + if (combatChanged.isTrue()) { + game.updateCombatForView(); + game.fireEvent(new GameEventCombatChanged()); + } } } } diff --git a/forge-gui/res/cardsfolder/upcoming/brimaz_blight_of_oreskos.txt b/forge-gui/res/cardsfolder/upcoming/brimaz_blight_of_oreskos.txt new file mode 100644 index 00000000000..d359ed716e7 --- /dev/null +++ b/forge-gui/res/cardsfolder/upcoming/brimaz_blight_of_oreskos.txt @@ -0,0 +1,12 @@ +Name:Brimaz, Blight of Oreskos +ManaCost:2 W B +Types:Legendary Creature Phyrexian Cat +PT:3/4 +T:Mode$ SpellCast | ValidCard$ Creature.Phyrexian,Creature.Artifact | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigIncubate | TriggerDescription$ Whenever you cast a Phyrexian creature or artifact creature spell, incubate X, where X is that spell's mana value. (Create an Incubator token with X +1/+1 counters on it and "2: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) +SVar:TrigIncubate:DB$ Incubate | Amount$ TriggeredStackInstance$CardManaCostLKI +T:Mode$ Phase | Phase$ End of Turn | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE1 | Execute$ TrigProliferate | TriggerDescription$ At the beginning of each end step, if a Phyrexian died under your control this turn, proliferate. +SVar:TrigProliferate:DB$ Proliferate +SVar:X:Count$ThisTurnEntered_Graveyard_from_Battlefield_Phyrexian.YouCtrl +DeckHints:Type$Phyrexian & Ability$Sacrifice +DeckHas:Ability$Token|Counters & Type$Artifact +Oracle:Whenever you cast a Phyrexian creature or artifact creature spell, incubate X, where X is that spell's mana value. (Create an Incubator token with X +1/+1 counters on it and "2: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.)\nAt the beginning of each end step, if a Phyrexian died under your control this turn, proliferate. diff --git a/forge-gui/res/cardsfolder/upcoming/glissa_herald_of_predation.txt b/forge-gui/res/cardsfolder/upcoming/glissa_herald_of_predation.txt index b2d7a562688..a39663ff0cb 100644 --- a/forge-gui/res/cardsfolder/upcoming/glissa_herald_of_predation.txt +++ b/forge-gui/res/cardsfolder/upcoming/glissa_herald_of_predation.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Phyrexian Zombie Elf PT:3/5 T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | Execute$ TrigCharm | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of combat on your turn, ABILITY SVar:TrigCharm:DB$ Charm | Choices$ Incubate,Transform,PumpAll | CharmNum$ 1 -SVar:Incubate:DB$ Incubate | Amount$ 2 | Times$ 2 | SpellDescription$ Incubate 2 twice. (To incubate 2, create an Incubator token with three +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) +SVar:Incubate:DB$ Incubate | Amount$ 2 | Times$ 2 | SpellDescription$ Incubate 2 twice. (To incubate 2, create an Incubator token with two +1/+1 counters on it and "{2}: Transform this artifact." It transforms into a 0/0 Phyrexian artifact creature.) SVar:Transform:DB$ SetState | Defined$ Valid Incubator.token+YouCtrl | Mode$ Transform | SpellDescription$ Transform all Incubator tokens you control. SVar:PumpAll:DB$ PumpAll | ValidCards$ Phyrexian.YouCtrl | KW$ First Strike & Deathtouch | SpellDescription$ Phyrexians you control gain first strike and deathtouch until end of turn. DeckHas:Ability$Token|Counters & Type$Artifact diff --git a/forge-gui/res/tokenscripts/incubator.txt b/forge-gui/res/tokenscripts/incubator_c_0_0_a_phyrexian.txt similarity index 100% rename from forge-gui/res/tokenscripts/incubator.txt rename to forge-gui/res/tokenscripts/incubator_c_0_0_a_phyrexian.txt