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 'master'

Browse Source 
Tweak NeedsToPlayKicked/NeedsToPlayKickedVar to play ball with Everflowing Chalice

See merge request core-developers/forge!3957
This commit is contained in:
Michael Kamensky
2021-02-21 13:26:07 +00:00
parent 26b9a06b6a f212be1fce
commit e6e9e00d7e
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1851,7 +1851,7 @@ public class ComputerUtilCard {
if (card.hasSVar("NeedsToPlayEvokedVar")) { if (card.hasSVar("NeedsToPlayEvokedVar")) {
needsToPlayVarName = "NeedsToPlayEvokedVar"; needsToPlayVarName = "NeedsToPlayEvokedVar";
} }
} else if (sa.isKicked()) { } else if (sa.isKicked() || card.getKickerMagnitude() > 0) {
// if the spell is kicked, uses NeedsToPlayKicked if able and locks out the regular NeedsToPlay check // if the spell is kicked, uses NeedsToPlayKicked if able and locks out the regular NeedsToPlay check
// for unkicked spells, uses NeedsToPlay // for unkicked spells, uses NeedsToPlay
if (card.hasSVar("NeedsToPlayKicked")) { if (card.hasSVar("NeedsToPlayKicked")) {

2
forge-gui/res/cardsfolder/e/everflowing_chalice.txt
View File

@@ -7,7 +7,7 @@ A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescriptio
SVar:X:Count$CardCounters.CHARGE SVar:X:Count$CardCounters.CHARGE
SVar:XKicked:Count$TimesKicked SVar:XKicked:Count$TimesKicked
DeckHas:Ability$Counters DeckHas:Ability$Counters
SVar:NeedsToPlayVar:Z GE4 SVar:NeedsToPlayKickedVar:Z GE4
SVar:Z:Count$Valid Land.YouCtrl+untapped SVar:Z:Count$Valid Land.YouCtrl+untapped
SVar:Picture:http://www.wizards.com/global/images/magic/general/everflowing_chalice.jpg SVar:Picture:http://www.wizards.com/global/images/magic/general/everflowing_chalice.jpg
Oracle:Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.)\nEverflowing Chalice enters the battlefield with a charge counter on it for each time it was kicked.\n{T}: Add {C} for each charge counter on Everflowing Chalice. Oracle:Multikicker {2} (You may pay an additional {2} any number of times as you cast this spell.)\nEverflowing Chalice enters the battlefield with a charge counter on it for each time it was kicked.\n{T}: Add {C} for each charge counter on Everflowing Chalice.