Fix Krark's Thumb (#4212)

* Fix Krark's Thumb * Allow KCI combo * Fix Goad * Tweak convoke reset to prevent AI cheat
Card-Forge · Nov 25, 2023 · e67f71a · e67f71a
1 parent e7dd448
commit e67f71a
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 24 deletions.
diff --git a/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java b/forge-game/src/main/java/forge/game/ability/SpellAbilityEffect.java
@@ -794,9 +794,11 @@ protected static void addUntilCommand(final SpellAbility sa, GameCommand until)
         addUntilCommand(sa, until, sa.getActivatingPlayer());
     }
     protected static void addUntilCommand(final SpellAbility sa, GameCommand until, Player controller) {
+        addUntilCommand(sa, until, sa.getParam("Duration"), controller);
+    }
+    protected static void addUntilCommand(final SpellAbility sa, GameCommand until, String duration, Player controller) {
         Card host = sa.getHostCard();
         final Game game = host.getGame();
-        final String duration = sa.getParam("Duration");
         // in case host was LKI or still resolving
         if (host.isLKI() || host.getZone() == null || host.getZone().is(ZoneType.Stack)) {
             host = game.getCardState(host);

diff --git a/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java b/forge-game/src/main/java/forge/game/ability/effects/FlipCoinEffect.java
@@ -196,25 +196,21 @@ public void resolve(SpellAbility sa) {
                         host.addRemembered(tempRemembered);
                     }
                 }
-            } else {
-                if (victory) {
-                    if (sa.getParam("RememberWinner") != null) {
-                        host.addRemembered(flipper);
-                    }
+            } else if (victory) {
+                if (sa.hasParam("RememberWinner")) {
+                    host.addRemembered(flipper);
+                }
 
-                    if (sa.hasAdditionalAbility("WinSubAbility")) {
-                        AbilityUtils.resolve(sa.getAdditionalAbility("WinSubAbility"));
-                    }
-                    // runParams.put("Won","True");
-                } else {
-                    if (sa.getParam("RememberLoser") != null) {
-                        host.addRemembered(flipper);
-                    }
+                if (sa.hasAdditionalAbility("WinSubAbility")) {
+                    AbilityUtils.resolve(sa.getAdditionalAbility("WinSubAbility"));
+                }
+            } else {
+                if (sa.hasParam("RememberLoser")) {
+                    host.addRemembered(flipper);
+                }
 
-                    if (sa.hasAdditionalAbility("LoseSubAbility")) {
-                        AbilityUtils.resolve(sa.getAdditionalAbility("LoseSubAbility"));
-                    }
-                    // runParams.put("Won","False");
+                if (sa.hasAdditionalAbility("LoseSubAbility")) {
+                    AbilityUtils.resolve(sa.getAdditionalAbility("LoseSubAbility"));
                 }
             }
         }
@@ -307,6 +303,6 @@ public static boolean flipCoinCall(final Player caller, final SpellAbility sa, f
 
     public static int getFlipMultiplier(final Player flipper) {
         String str = "If you would flip a coin, instead flip two coins and ignore one.";
-        return 1 + flipper.getKeywords().getAmount(str);
+        return 1 << flipper.getKeywords().getAmount(str);
     }
 }
diff --git a/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java b/forge-game/src/main/java/forge/game/ability/effects/GoadEffect.java
@@ -54,7 +54,7 @@ public void run() {
                     }
                 };
 
-                addUntilCommand(sa, until);
+                addUntilCommand(sa, until, duration, player);
             }
 
             if (remember && tgtC.isGoaded()) {

diff --git a/forge-game/src/main/java/forge/game/cost/CostAdjustment.java b/forge-game/src/main/java/forge/game/cost/CostAdjustment.java
@@ -281,6 +281,8 @@ else if (stAb.checkMode("SetCost")) {
     // GetSpellCostChange
 
     private static void adjustCostByConvokeOrImprovise(ManaCostBeingPaid cost, final SpellAbility sa, boolean improvise, boolean test) {
+        sa.clearTappedForConvoke();
+
         final Player activator = sa.getActivatingPlayer();
         CardCollectionView untappedCards = CardLists.filter(activator.getCardsIn(ZoneType.Battlefield),
                 CardPredicates.Presets.UNTAPPED);

diff --git a/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java b/forge-gui/src/main/java/forge/gamemodes/match/input/InputPayMana.java
@@ -349,7 +349,7 @@ public void run() {
                         }
                     }
 
-                    if (restrictionsMet) {
+                    if (restrictionsMet && !player.getController().isFullControl()) {
                         player.getManaPool().payManaFromAbility(saPaidFor, manaCost, chosen);
                     }
                     if (!restrictionsMet || chosen.getPayCosts().hasManaCost()) {

diff --git a/forge-gui/src/main/java/forge/player/HumanPlay.java b/forge-gui/src/main/java/forge/player/HumanPlay.java
@@ -552,9 +552,6 @@ private static boolean handleOfferingConvokeAndDelve(final SpellAbility ability,
                 runParams.put(AbilityKey.Cards, tapped);
                 game.getTriggerHandler().runTrigger(TriggerType.TapAll, runParams, false);
             }
-            if (manaInputCancelled) {
-                ability.clearTappedForConvoke();
-            }
         }
         if (!table.isEmpty() && !manaInputCancelled) {
             table.triggerChangesZoneAll(game, ability);
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,7 +54,7 @@ public void run() { @@
                         }
                     };
-                    addUntilCommand(sa, until);
+                    addUntilCommand(sa, until, duration, player);
                 }
                 if (remember && tgtC.isGoaded()) {
@@ Expand Down @@