From f212be1fce9404d50c8a27cf40484d426239cf22 Mon Sep 17 00:00:00 2001
From: Michael Kamensky <stavdev@mail.ru>
Date: Sun, 21 Feb 2021 16:25:23 +0300
Subject: [PATCH] - Tweak NeedsToPlayKicked/NeedsToPlayKickedVar to play ball
 with Everflowing Chalice. Add NeedsToPlayKickedVar to Everflowing Chalice.

---
 forge-ai/src/main/java/forge/ai/ComputerUtilCard.java | 2 +-
 forge-gui/res/cardsfolder/e/everflowing_chalice.txt   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
index 109c5dfc423..30b0fbeecc8 100644
--- a/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
+++ b/forge-ai/src/main/java/forge/ai/ComputerUtilCard.java
@@ -1851,7 +1851,7 @@ public class ComputerUtilCard {
                 if (card.hasSVar("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
                 // for unkicked spells, uses NeedsToPlay
                 if (card.hasSVar("NeedsToPlayKicked")) {
diff --git a/forge-gui/res/cardsfolder/e/everflowing_chalice.txt b/forge-gui/res/cardsfolder/e/everflowing_chalice.txt
index 3ef45b2ad49..501615ae8f5 100644
--- a/forge-gui/res/cardsfolder/e/everflowing_chalice.txt
+++ b/forge-gui/res/cardsfolder/e/everflowing_chalice.txt
@@ -7,7 +7,7 @@ A:AB$ Mana | Cost$ T | Produced$ C | Amount$ X | References$ X | SpellDescriptio
 SVar:X:Count$CardCounters.CHARGE
 SVar:XKicked:Count$TimesKicked
 DeckHas:Ability$Counters
-SVar:NeedsToPlayVar:Z GE4
+SVar:NeedsToPlayKickedVar:Z GE4
 SVar:Z:Count$Valid Land.YouCtrl+untapped
 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.