From 8f4a83e44a1ad480d75c6de6f8cc73936efa5dc6 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 15 Jul 2021 10:53:53 -0400 Subject: [PATCH 1/6] vish_kal_blood_arbiter.txt tidy up --- forge-gui/res/cardsfolder/v/vish_kal_blood_arbiter.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/forge-gui/res/cardsfolder/v/vish_kal_blood_arbiter.txt b/forge-gui/res/cardsfolder/v/vish_kal_blood_arbiter.txt index 3c939feaac5..035af83c72e 100644 --- a/forge-gui/res/cardsfolder/v/vish_kal_blood_arbiter.txt +++ b/forge-gui/res/cardsfolder/v/vish_kal_blood_arbiter.txt @@ -4,10 +4,9 @@ Types:Legendary Creature Vampire PT:5/5 K:Flying K:Lifelink -A:AB$PutCounter | Cost$ Sac<1/Creature> | Defined$ Self | CounterType$ P1P1 | CounterNum$ Y | SpellDescription$ Put X +1/+1 counters on CARDNAME, where X is the sacrificed creature's power. -A:AB$ Pump | Cost$ SubCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -X | NumDef$ -X | SpellDescription$ Target creature gets -1/-1 until end of turn for each +1/+1 counter removed this way. +A:AB$ PutCounter | Cost$ Sac<1/Creature> | Defined$ Self | CounterType$ P1P1 | CounterNum$ Y | SpellDescription$ Put X +1/+1 counters on CARDNAME, where X is the sacrificed creature's power. +A:AB$ Pump | Cost$ SubCounter | CostDesc$ Remove all +1/+1 counters from NICKNAME: | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -X | NumDef$ -X | SpellDescription$ Target creature gets -1/-1 until end of turn for each +1/+1 counter removed this way. SVar:Y:Sacrificed$CardPower SVar:X:SVar$CostCountersRemoved AI:RemoveDeck:All -SVar:Picture:http://www.wizards.com/global/images/magic/general/vish_kal_blood_arbiter.jpg Oracle:Flying, lifelink\nSacrifice a creature: Put X +1/+1 counters on Vish Kal, Blood Arbiter, where X is the sacrificed creature's power.\nRemove all +1/+1 counters from Vish Kal: Target creature gets -1/-1 until end of turn for each +1/+1 counter removed this way. From de8a4c9df8bd69fab7cb2564c933219050ee7ab3 Mon Sep 17 00:00:00 2001 From: Bug Hunter Date: Fri, 16 Jul 2021 06:31:51 +0000 Subject: [PATCH 2/6] Update forge-gui/res/cardsfolder/i/idol_of_oblivion.txt --- forge-gui/res/cardsfolder/i/idol_of_oblivion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt b/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt index eabaa262ef7..3f4bab2954a 100644 --- a/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt +++ b/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt @@ -1,7 +1,7 @@ Name:Idol of Oblivion ManaCost:2 Types:Artifact -A:AB$ Draw | Cost$ T | NumCards$ 1 | CheckSVar$ X | SpellDescription$ Draw a card. Activate only if you could a token this turn. +A:AB$ Draw | Cost$ T | NumCards$ 1 | CheckSVar$ X | SpellDescription$ Draw a card. Activate only if you created a token this turn. SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+YouCtrl A:AB$ Token | Cost$ 8 T Sac<1/CARDNAME> | TokenAmount$ 1 | TokenScript$ c_10_10_eldrazi | TokenOwner$ You | LegacyImage$ c c 10 eldrazi c19 | SpellDescription$ Create a 10/10 colorless Eldrazi creature token. Oracle:{T}: Draw a card. Activate only if you created a token this turn.\n{8}, {T}, Sacrifice Idol of Oblivion: Create a 10/10 colorless Eldrazi creature token. From 764a77b69e61a364b41deb7e7e12ca6aa81839d7 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 16 Jul 2021 09:44:11 +0200 Subject: [PATCH 3/6] Fix infinite loop when lib empties --- .../src/main/java/forge/game/ability/effects/RepeatEffect.java | 2 +- forge-gui/res/cardsfolder/upcoming/tashas_hideous_laughter.txt | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java index 5c384cd1401..92652afa881 100644 --- a/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java +++ b/forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java @@ -49,7 +49,7 @@ public class RepeatEffect extends SpellAbilityEffect { // TODO Replace Infinite Loop Break with a game draw. Here are the scenarios that can cause this: // Helm of Obedience vs Graveyard to Library replacement effect - if(source.getName().equals("Helm of Obedience")) { + if (source.getName().equals("Helm of Obedience")) { StringBuilder infLoop = new StringBuilder(sa.getHostCard().toString()); infLoop.append(" - To avoid an infinite loop, this repeat has been broken "); infLoop.append(" and the game will now continue in the current state, ending the loop early. "); diff --git a/forge-gui/res/cardsfolder/upcoming/tashas_hideous_laughter.txt b/forge-gui/res/cardsfolder/upcoming/tashas_hideous_laughter.txt index adca1ec2a29..51c7622eceb 100644 --- a/forge-gui/res/cardsfolder/upcoming/tashas_hideous_laughter.txt +++ b/forge-gui/res/cardsfolder/upcoming/tashas_hideous_laughter.txt @@ -2,8 +2,9 @@ Name:Tasha's Hideous Laughter ManaCost:1 U U Types:Sorcery A:SP$ RepeatEach | RepeatPlayers$ Opponent | RepeatSubAbility$ DBRepeat | SpellDescription$ Each opponent exiles cards from the top of their library until that player has exiled cards with total mana value 20 or more. -SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBExile | RepeatCheckSVar$ X | RepeatSVarCompare$ LT20 | SubAbility$ DBCleanup +SVar:DBRepeat:DB$ Repeat | RepeatSubAbility$ DBExile | RepeatCheckSVar$ X | RepeatSVarCompare$ LT20 | MaxRepeat$ Y | SubAbility$ DBCleanup SVar:DBExile:DB$ Dig | Defined$ Remembered | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Imprint$ True SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True SVar:X:Imprinted$CardManaCost +SVar:Y:PlayerCountRemembered$CardsInLibrary Oracle:Each opponent exiles cards from the top of their library until that player has exiled cards with total mana value 20 or more. From 09774ae13feb70077f425dd75cb0840f319fdea0 Mon Sep 17 00:00:00 2001 From: John Date: Fri, 16 Jul 2021 09:16:33 +0000 Subject: [PATCH 4/6] Update Love Your LGS 2021.txt --- forge-gui/res/editions/Love Your LGS 2021.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/forge-gui/res/editions/Love Your LGS 2021.txt b/forge-gui/res/editions/Love Your LGS 2021.txt index 7df61471eea..0e4be5a0da4 100644 --- a/forge-gui/res/editions/Love Your LGS 2021.txt +++ b/forge-gui/res/editions/Love Your LGS 2021.txt @@ -7,7 +7,10 @@ ScryfallCode=PLG21 [cards] 1 R Aven Mindcensor +J1 R Orb of Dragonkind 2 R Dig Through Time +J2 R Orb of Dragonkind 3 R Bolas's Citadel +J3 R Orb of Dragonkind 4 R Goblin Guide 5 R Scavenging Ooze From da338f02c3a7801a42c7eccfa7330ff3648c01eb Mon Sep 17 00:00:00 2001 From: Hans Mackowiak Date: Fri, 16 Jul 2021 12:06:45 +0200 Subject: [PATCH 5/6] fix Xorn --- forge-gui/res/cardsfolder/upcoming/xorn.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/upcoming/xorn.txt b/forge-gui/res/cardsfolder/upcoming/xorn.txt index 6e5e333bb6a..1b82cc5ee5c 100644 --- a/forge-gui/res/cardsfolder/upcoming/xorn.txt +++ b/forge-gui/res/cardsfolder/upcoming/xorn.txt @@ -3,7 +3,7 @@ ManaCost:2 R Types:Creature Elemental PT:3/2 R:Event$ CreateToken | ActiveZones$ Battlefield | ValidPlayer$ You | ValidToken$ Treasure | ReplaceWith$ DBReplace | Description$ If you would create one or more Treasure tokens, instead create those tokens plus an additional Treasure token. -SVar:DBReplace:DB$ ReplaceToken | Type$ AddToken | Amount$ 1 | TokenScript$ c_a_treasure_sac +SVar:DBReplace:DB$ ReplaceToken | Type$ AddToken | Amount$ 1 | ValidCard$ Treasure | TokenScript$ c_a_treasure_sac DeckNeeds:Type$Token AI:RemoveDeck:Random Oracle:If you would create one or more Treasure tokens, instead create those tokens plus an additional Treasure token. From 9a5fdce07173d1f21cea2832538f6b8aafc9ed2b Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Fri, 16 Jul 2021 13:21:38 +0200 Subject: [PATCH 6/6] Small fix for Crippling Fear --- forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java b/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java index 91690a61212..c6eba2b0c10 100644 --- a/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java +++ b/forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java @@ -34,6 +34,7 @@ public class ChooseTypeAi extends SpellAbilityAi { if (ComputerUtilAbility.getAbilitySourceName(sa).equals("Mirror Entity Avatar")) { return doMirrorEntityLogic(aiPlayer, sa); } + return !chooseType(sa, aiPlayer.getCardsIn(ZoneType.Battlefield)).isEmpty(); } else if ("MostProminentOppControls".equals(sa.getParam("AILogic"))) { return !chooseType(sa, aiPlayer.getOpponents().getCardsIn(ZoneType.Battlefield)).isEmpty(); }