external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into AFC_Cards_20210715

Browse Source
This commit is contained in:
Wendell Wilkerson
2021-07-16 09:25:21 -05:00
parent 2b12d56f17 ca65ff229f
commit 83554b032f
7 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-ai/src/main/java/forge/ai/ability/ChooseTypeAi.java
View File

@@ -34,6 +34,7 @@ public class ChooseTypeAi extends SpellAbilityAi {
if (ComputerUtilAbility.getAbilitySourceName(sa).equals("Mirror Entity Avatar")) { if (ComputerUtilAbility.getAbilitySourceName(sa).equals("Mirror Entity Avatar")) {
return doMirrorEntityLogic(aiPlayer, sa); return doMirrorEntityLogic(aiPlayer, sa);
} }
return !chooseType(sa, aiPlayer.getCardsIn(ZoneType.Battlefield)).isEmpty();
} else if ("MostProminentOppControls".equals(sa.getParam("AILogic"))) { } else if ("MostProminentOppControls".equals(sa.getParam("AILogic"))) {
return !chooseType(sa, aiPlayer.getOpponents().getCardsIn(ZoneType.Battlefield)).isEmpty(); return !chooseType(sa, aiPlayer.getOpponents().getCardsIn(ZoneType.Battlefield)).isEmpty();
} }

2
forge-game/src/main/java/forge/game/ability/effects/RepeatEffect.java
View File

@@ -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: // 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 // 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()); StringBuilder infLoop = new StringBuilder(sa.getHostCard().toString());
infLoop.append(" - To avoid an infinite loop, this repeat has been broken "); 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. "); infLoop.append(" and the game will now continue in the current state, ending the loop early. ");

2
forge-gui/res/cardsfolder/i/idol_of_oblivion.txt
View File

@@ -1,7 +1,7 @@
Name:Idol of Oblivion Name:Idol of Oblivion
ManaCost:2 ManaCost:2
Types:Artifact 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 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. 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. 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.

3
forge-gui/res/cardsfolder/upcoming/tashas_hideous_laughter.txt
View File

@@ -2,8 +2,9 @@ Name:Tasha's Hideous Laughter
ManaCost:1 U U ManaCost:1 U U
Types:Sorcery 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. 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:DBExile:DB$ Dig | Defined$ Remembered | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | Imprint$ True
SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True
SVar:X:Imprinted$CardManaCost 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. Oracle:Each opponent exiles cards from the top of their library until that player has exiled cards with total mana value 20 or more.

2
forge-gui/res/cardsfolder/upcoming/xorn.txt
View File

@@ -3,7 +3,7 @@ ManaCost:2 R
Types:Creature Elemental Types:Creature Elemental
PT:3/2 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. 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 DeckNeeds:Type$Token
AI:RemoveDeck:Random AI:RemoveDeck:Random
Oracle:If you would create one or more Treasure tokens, instead create those tokens plus an additional Treasure token. Oracle:If you would create one or more Treasure tokens, instead create those tokens plus an additional Treasure token.

5
forge-gui/res/cardsfolder/v/vish_kal_blood_arbiter.txt
View File

@@ -4,10 +4,9 @@ Types:Legendary Creature Vampire
PT:5/5 PT:5/5
K:Flying K:Flying
K:Lifelink 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$ 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<All/P1P1> | 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$ Pump | Cost$ SubCounter<All/P1P1> | 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:Y:Sacrificed$CardPower
SVar:X:SVar$CostCountersRemoved SVar:X:SVar$CostCountersRemoved
AI:RemoveDeck:All 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. 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.

3
forge-gui/res/editions/Love Your LGS 2021.txt
View File

@@ -7,7 +7,10 @@ ScryfallCode=PLG21
[cards] [cards]
1 R Aven Mindcensor 1 R Aven Mindcensor
J1 R Orb of Dragonkind
2 R Dig Through Time 2 R Dig Through Time
J2 R Orb of Dragonkind
3 R Bolas's Citadel 3 R Bolas's Citadel
J3 R Orb of Dragonkind
4 R Goblin Guide 4 R Goblin Guide
5 R Scavenging Ooze 5 R Scavenging Ooze