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

Merge branch 'master' into 'master'

Browse Source 
Some AI hint updates (M21, some PlayMain1 additions, minor random changes)

See merge request core-developers/forge!3010
This commit is contained in:
Michael Kamensky
2020-07-19 08:26:44 +00:00
parent cef4a85e6f 0c1a6b88bc
commit aafbdd1a9c
25 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-ai/src/main/java/forge/ai/ComputerUtil.java
View File

@@ -1009,7 +1009,7 @@ public class ComputerUtil {
return true;
}
if (card.hasKeyword(Keyword.EXALTED)) {
if (card.hasKeyword(Keyword.EXALTED) || card.hasKeyword(Keyword.EXTORT)) {
return true;
}

1
forge-gui/res/cardsfolder/b/bad_deal.txt
View File

@@ -4,4 +4,5 @@ Types:Sorcery
A:SP$ Draw | Cost$ 4 B B | NumCards$ 2 | SubAbility$ DBDiscard | SpellDescription$ You draw two cards and each opponent discards two cards. Each player loses 2 life.
SVar:DBDiscard:DB$ Discard | Defined$ Opponent | NumCards$ 2 | Mode$ TgtChoose | SubAbility$ DBLoseLife
SVar:DBLoseLife:DB$ LoseLife | LifeAmount$ 2 | Defined$ Player
DeckHas:Ability$Discard
Oracle:You draw two cards and each opponent discards two cards. Each player loses 2 life.

1
forge-gui/res/cardsfolder/b/battle_rattle_shaman.txt
View File

@@ -4,5 +4,6 @@ Types:Creature Goblin Shaman
PT:2/2
T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, you may have target creature get +2/+0 until end of turn.
SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2
SVar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/battle_rattle_shaman.jpg
Oracle:At the beginning of combat on your turn, you may have target creature get +2/+0 until end of turn.

1
forge-gui/res/cardsfolder/b/bone_pit_brute.txt
View File

@@ -5,4 +5,5 @@ PT:4/5
K:Menace
T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigPump | TriggerDescription$ When CARDNAME enters the battlefield, target creature gets +4/+0 until end of turn.
SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 4
SVar:PlayMain1:TRUE
Oracle:Menace (This creature can't be blocked except by two or more creatures.)\nWhen Bone Pit Brute enters the battlefield, target creature gets +4/+0 until end of turn.

1
forge-gui/res/cardsfolder/d/dromoka_the_eternal.txt
View File

@@ -5,6 +5,7 @@ PT:5/5
K:Flying
T:Mode$ Attacks | ValidCard$ Dragon.YouCtrl | Execute$ TrigBolster | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Dragon you control attacks, bolster 2. (Choose a creature with the least toughness among creatures you control and put two +1/+1 counters on it.)
SVar:TrigBolster:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | Bolster$ True
SVar:PlayMain1:TRUE
DeckHints:Type$Dragon
SVar:Picture:http://www.wizards.com/global/images/magic/general/dromoka_the_eternal.jpg
Oracle:Flying\nWhenever a Dragon you control attacks, bolster 2. (Choose a creature with the least toughness among creatures you control and put two +1/+1 counters on it.)

1
forge-gui/res/cardsfolder/f/faiths_fetters.txt
View File

@@ -7,5 +7,6 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 4
S:Mode$ CantBeActivated | ValidCard$ Card.EnchantedBy | NonMana$ True | Description$ Enchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddHiddenKeyword$ CARDNAME can't attack or block.
DeckHas:Ability$LifeGain
SVar:Picture:http://www.wizards.com/global/images/magic/general/faiths_fetters.jpg
Oracle:Enchant permanent\nWhen Faith's Fetters enters the battlefield, you gain 4 life.\nEnchanted permanent can't attack or block, and its activated abilities can't be activated unless they're mana abilities.

1
forge-gui/res/cardsfolder/f/frantic_inventory.txt
View File

@@ -4,5 +4,4 @@ Types:Instant
A:SP$ Draw | Cost$ 1 U | Defined$ You | NumCards$ 1 | SubAbility$ DBDraw | SpellDescription$ Draw a card, then draw cards equal to the number of cards named Frantic Inventory in your graveyard.
SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ X | References$ X
SVar:X:Count$ValidGraveyard Card.YouOwn+namedFrantic Inventory
DeckNeeds:Name$Frantic Inventory
Oracle:Draw a card, then draw cards equal to the number of cards named Frantic Inventory in your graveyard.

2
forge-gui/res/cardsfolder/g/ghostly_pilferer.txt
View File

@@ -6,5 +6,7 @@ T:Mode$ Untaps | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ Tri
SVar:TrigDraw1:AB$ Draw | Cost$ 2 | Defined$ You | NumCards$ 1
T:Mode$ SpellCast | ValidCard$ Card.wasNotCastFromHand | ValidActivatingPlayer$ Opponent | TriggerZones$ Battlefield | Execute$ TrigDraw2 | TriggerDescription$ Whenever an opponent casts a spell from anywhere other than their hand, draw a card.
SVar:TrigDraw2:DB$ Draw | Defined$ You | NumCards$ 1
SVar:AIPreference:DiscardCost$Card.cmcLE2
DeckHas:Ability$Discard
A:AB$ Pump | Cost$ Discard<1/Card> | Defined$ Self | KW$ HIDDEN Unblockable | SpellDescription$ CARDNAME can't be blocked this turn.
Oracle:Whenever Ghostly Pilferer becomes untapped, you may pay {2}. If you do, draw a card.\nWhenever an opponent casts a spell from anywhere other than their hand, draw a card.\nDiscard a card: Ghostly Pilferer can't be blocked this turn.

1
forge-gui/res/cardsfolder/i/infernal_scarring.txt
View File

@@ -6,5 +6,6 @@ A:SP$ Attach | Cost$ 1 B | ValidTgts$ Creature | AILogic$ Pump
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddTrigger$ TrigDraw | AddSVar$ InfernalDraw | Description$ Enchanted creature gets +2/+0 and has "When this creature dies, draw a card."
SVar:TrigDraw:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ InfernalDraw | TriggerController$ TriggeredCardController | TriggerDescription$ When this creature dies, draw a card.
SVar:InfernalDraw:DB$Draw | NumCards$ 1 | Defined$ TriggeredCardController
SVar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/infernal_scarring.jpg
Oracle:Enchant creature\nEnchanted creature gets +2/+0 and has "When this creature dies, draw a card."

1
forge-gui/res/cardsfolder/k/kinetic_augur.txt
View File

@@ -11,4 +11,5 @@ SVar:TrigDiscard:DB$ Discard | Defined$ You | NumCards$ 2 | Optional$ True | Mod
SVar:DBDraw:DB$ Draw | NumCards$ Y | References$ Y | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
SVar:Y:Remembered$Amount
DeckHas:Ability$Discard
Oracle:Trample (This creature can deal excess combat damage to the player or planeswalker it's attacking.)\nKinetic Augur's power is equal to the number of instant and sorcery cards in your graveyard.\nWhen Kinetic Augur enters the battlefield, discard up to two cards, then draw that many cards.

2
forge-gui/res/cardsfolder/l/lavacore_elemental.txt
View File

@@ -5,6 +5,8 @@ PT:5/3
K:Vanishing:1
T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | TriggerZones$ Battlefield | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigPutCounter | TriggerDescription$ Whenever a creature you control deals combat damage to a player, put a time counter on CARDNAME.
SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ TIME | CounterNum$ 1
SVar:PlayMain1:ALWAYS
SVar:NeedsToPlay:Creature.YouCtrl
AI:RemoveDeck:Random
SVar:Picture:http://www.wizards.com/global/images/magic/general/lavacore_elemental.jpg
Oracle:Vanishing 1 (This permanent enters the battlefield with a time counter on it. At the beginning of your upkeep, remove a time counter from it. When the last is removed, sacrifice it.)\nWhenever a creature you control deals combat damage to a player, put a time counter on Lavacore Elemental.

1
forge-gui/res/cardsfolder/l/life_goes_on.txt
View File

@@ -3,5 +3,6 @@ ManaCost:G
Types:Instant
A:SP$ GainLife | Cost$ G | LifeAmount$ X | References$ X | SpellDescription$ You gain 4 life. If a creature died this turn, you gain 8 life instead.
SVar:X:Count$Morbid.8.4
DeckHas:Ability$LifeGain
SVar:Picture:http://www.wizards.com/global/images/magic/general/life_goes_on.jpg
Oracle:You gain 4 life. If a creature died this turn, you gain 8 life instead.

1
forge-gui/res/cardsfolder/l/liliana_dreadhorde_general.txt
View File

@@ -15,4 +15,5 @@ SVar:ChoosePW:DB$ ChooseCard | Defined$ Remembered | Amount$ 1 | Choices$ Planes
SVar:SacAllOthers:DB$ SacrificeAll | ValidCards$ Permanent.IsNotRemembered+OppCtrl | SubAbility$ DBCleanup
SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
DeckHas:Ability$Token & Ability$Sacrifice
SVar:PlayMain1:TRUE
Oracle:Whenever a creature you control dies, draw a card.\n[+1]:Create a 2/2 black Zombie creature token.\n[-4]:Each player sacrifices two creatures.\n[-9]: Each opponent chooses a permanent they control of each permanent type and sacrifices the rest.

1
forge-gui/res/cardsfolder/l/lorescale_coatl.txt
View File

@@ -4,5 +4,6 @@ Types:Creature Snake
PT:2/2
T:Mode$ Drawn | ValidCard$ Card.YouCtrl | TriggerZones$ Battlefield | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever you draw a card, you may put a +1/+1 counter on CARDNAME.
SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
DeckHas:Ability$Counters
SVar:Picture:http://www.wizards.com/global/images/magic/general/lorescale_coatl.jpg
Oracle:Whenever you draw a card, you may put a +1/+1 counter on Lorescale Coatl.

1
forge-gui/res/cardsfolder/m/marisi_breaker_of_the_coil.txt
View File

@@ -5,4 +5,5 @@ PT:5/4
S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.Opponent | Phases$ BeginCombat->EndCombat | Description$ Your opponents can't cast spells during combat.
T:Mode$ DamageDone | ValidSource$ Creature.YouCtrl | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigGoad | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control deals combat damage to a player, goad each creature that player controls (Until your next turn, those creatures attack each combat if able and attack a player other than you if able.)
SVar:TrigGoad:DB$ Goad | Defined$ Valid Creature.ControlledBy Player.TriggeredTarget
SVar:PlayMain1:TRUE
Oracle:Your opponents can't cast spells during combat.\nWhenever a creature you control deals combat damage to a player, goad each creature that player controls (Until your next turn, those creatures attack each combat if able and attack a player other than you if able.)

1
forge-gui/res/cardsfolder/m/mind_rot.txt
View File

@@ -2,5 +2,6 @@ Name:Mind Rot
ManaCost:2 B
Types:Sorcery
A:SP$ Discard | Cost$ 2 B | ValidTgts$ Player | NumCards$ 2 | Mode$ TgtChoose | SpellDescription$ Target player discards two cards.
DeckHas:Ability$Discard
SVar:Picture:http://www.wizards.com/global/images/magic/general/mind_rot.jpg
Oracle:Target player discards two cards.

2
forge-gui/res/cardsfolder/o/obsessive_stitcher.txt
View File

@@ -5,5 +5,5 @@ PT:0/3
A:AB$ Draw | Cost$ T | NumCards$ 1 | SpellDescription$ Draw a card, then discard a card. | SubAbility$ DBDiscard
SVar:DBDiscard:DB$ Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
A:AB$ ChangeZone | Cost$ 2 U B T Sac<1/CARDNAME> | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return target creature card from your graveyard to the battlefield.
DeckHints:Ability$Graveyard & Ability$Discard
DeckHas:Ability$Graveyard & Ability$Discard
Oracle:{T}: Draw a card, then discard a card.\n{2}{U}{B}, {T}, Sacrifice Obsessive Stitcher: Return target creature card from your graveyard to the battlefield.

1
forge-gui/res/cardsfolder/p/proper_burial.txt
View File

@@ -4,5 +4,6 @@ Types:Enchantment
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | TriggerZones$ Battlefield | Execute$ TrigGain | TriggerDescription$ Whenever a creature you control dies, you gain life equal to that creature's toughness.
SVar:TrigGain:DB$GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:TriggeredCard$CardToughness
SVar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/proper_burial.jpg
Oracle:Whenever a creature you control dies, you gain life equal to that creature's toughness.

2
forge-gui/res/cardsfolder/q/quirion_dryad.txt
View File

@@ -5,7 +5,7 @@ PT:1/1
T:Mode$ SpellCast | ValidCard$ Card.White,Card.Blue,Card.Black,Card.Red | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever you cast a white, blue, black, or red spell, put a +1/+1 counter on CARDNAME.
SVar:TrigPutCounter:DB$PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1
SVar:BuffedBy:Card.White,Card.Blue,Card.Black,Card.Red
AI:RemoveDeck:Random
DeckHas:Ability$Counters
DeckNeeds:Color$white|blue|black|red
SVar:Picture:http://www.wizards.com/global/images/magic/general/quirion_dryad.jpg
Oracle:Whenever you cast a white, blue, black, or red spell, put a +1/+1 counter on Quirion Dryad.

1
forge-gui/res/cardsfolder/r/requiem_angel.txt
View File

@@ -6,5 +6,6 @@ K:Flying
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.nonSpirit+YouCtrl+Other | TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ Whenever another non-Spirit creature you control dies, create a 1/1 white Spirit creature token with flying.
SVar:TrigToken:DB$ Token | LegacyImage$ w 1 1 spirit flying dka | TokenAmount$ 1 | TokenScript$ w_1_1_spirit_flying | TokenOwner$ You
DeckHas:Ability$Token
SVar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/requiem_angel.jpg
Oracle:Flying\nWhenever another non-Spirit creature you control dies, create a 1/1 white Spirit creature token with flying.

1
forge-gui/res/cardsfolder/r/revitalize.txt
View File

@@ -3,4 +3,5 @@ ManaCost:1 W
Types:Instant
A:SP$ GainLife | Cost$ 1 W | Defined$ You | LifeAmount$ 3 | SubAbility$ DBDraw | SpellDescription$ You gain 3 life.
SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You | SpellDescription$ Draw a card.
DeckHas:Ability$LifeGain
Oracle:You gain 3 life.\nDraw a card.

1
forge-gui/res/cardsfolder/r/rousing_read.txt
View File

@@ -7,4 +7,5 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S
SVar:TrigDraw:DB$Draw | Defined$ You | NumCards$ 2 | SubAbility$ DBDiscard
SVar:DBDiscard:DB$Discard | Defined$ You | NumCards$ 1 | Mode$ TgtChoose
S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Flying | Description$ Enchanted creature gets +1/+1 and has flying.
DeckHas:Ability$Discard
Oracle:Enchant creature\nWhen Rousing Read enters the battlefield, draw two cards, then discard a card.\nEnchanted creature gets +1/+1 and has flying.

1
forge-gui/res/cardsfolder/s/sanctum_of_stone_fangs.txt
View File

@@ -6,4 +6,5 @@ SVar:TrigDrain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ X | Referen
SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ X | References$ X
SVar:X:Count$TypeYouCtrl.Shrine
DeckHints:Type$Shrine
DeckHas:Ability$LifeGain
Oracle:At the beginning of your precombat main phase, each opponent loses X life and you gain X life, where X is the number of Shrines you control.

1
forge-gui/res/cardsfolder/t/tavern_swindler.txt
View File

@@ -4,5 +4,6 @@ Types:Creature Human Rogue
PT:2/2
A:AB$ FlipACoin | Cost$ T PayLife<3> | WinSubAbility$ TSGainLife | AILogic$ Never | SpellDescription$ Flip a coin. If you win the flip, you gain 6 life.
SVar:TSGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 6
DeckHas:Ability$LifeGain
SVar:Picture:http://www.wizards.com/global/images/magic/general/tavern_swindler.jpg
Oracle:{T}, Pay 3 life: Flip a coin. If you win the flip, you gain 6 life.

1
forge-gui/res/cardsfolder/t/teferis_veil.txt
View File

@@ -6,5 +6,6 @@ SVar:DelayedTrig:DB$ DelayedTrigger | Mode$ Phase | Phase$ EndCombat | ValidPlay
SVar:TrigPhase:DB$Phases | Defined$ DelayTriggerRemembered
AI:RemoveDeck:All
SVar:NonStackingEffect:True
Svar:PlayMain1:TRUE
SVar:Picture:http://www.wizards.com/global/images/magic/general/teferis_veil.jpg
Oracle:Whenever a creature you control attacks, it phases out at end of combat. (While it's phased out, it's treated as though it doesn't exist. It phases in before you untap during your next untap step.)