From 41bde9aaa6baa658ae0c393b38c4af1defe09ddc Mon Sep 17 00:00:00 2001
From: Michael Kamensky <stavdev@mail.ru>
Date: Fri, 12 Mar 2021 18:38:51 +0300
Subject: [PATCH] - Fix several Un-cards, add a couple AI hints.

---
 forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java | 2 ++
 forge-gui/res/cardsfolder/c/chicken_a_la_king.txt       | 2 +-
 forge-gui/res/cardsfolder/m/mana_screw.txt              | 1 +
 forge-gui/res/cardsfolder/s/steel_squirrel.txt          | 2 +-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java b/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java
index 4c4ffea22da..58056b3f536 100644
--- a/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java
+++ b/forge-ai/src/main/java/forge/ai/ability/RollDiceAi.java
@@ -26,6 +26,8 @@ public class RollDiceAi extends SpellAbilityAi {
             return game.getCombat() != null && (game.getCombat().isAttacking(source) || game.getCombat().isBlocking(source));
         } else if (logic.equals("Main2")) {
             return ph.is(PhaseType.MAIN2, aiPlayer);
+        } else if (logic.equals("AtOppEOT")) {
+            return ph.getNextTurn() == aiPlayer && ph.is(PhaseType.END_OF_TURN);
         }
 
         if (cost != null && (sa.getPayCosts().hasManaCost() || sa.getPayCosts().hasTapCost())) {
diff --git a/forge-gui/res/cardsfolder/c/chicken_a_la_king.txt b/forge-gui/res/cardsfolder/c/chicken_a_la_king.txt
index cc2bc1178da..53720fdfc14 100644
--- a/forge-gui/res/cardsfolder/c/chicken_a_la_king.txt
+++ b/forge-gui/res/cardsfolder/c/chicken_a_la_king.txt
@@ -4,6 +4,6 @@ Types:Creature Bird Noble
 PT:2/2
 T:Mode$ RolledDie | TriggerZones$ Battlefield | Execute$ TrigCounters | ValidResult$ 6 | TriggerDescription$ Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Bird.
 SVar:TrigCounters:DB$ PutCounterAll | ValidCards$ Bird | CounterType$ P1P1 | CounterNum$ 1
-A:AB$ RollDice | Cost$ tapXType<1/Bird> | SpellDescription$ Roll a six-sided die.
+A:AB$ RollDice | Cost$ tapXType<1/Bird> | AILogic$ AtOppEOT | SpellDescription$ Roll a six-sided die.
 DeckHas:Ability$Counters
 Oracle:Whenever a 6 is rolled on a six-sided die, put a +1/+1 counter on each Bird. (You may roll dice only when instructed to.)\nTap an untapped Bird you control: Roll a six-sided die. (Like now.)
diff --git a/forge-gui/res/cardsfolder/m/mana_screw.txt b/forge-gui/res/cardsfolder/m/mana_screw.txt
index 6e3cbbb6662..dbab6d23977 100644
--- a/forge-gui/res/cardsfolder/m/mana_screw.txt
+++ b/forge-gui/res/cardsfolder/m/mana_screw.txt
@@ -4,4 +4,5 @@ Types:Artifact
 A:AB$ FlipACoin | Cost$ 1 | WinSubAbility$ DBMana | SubAbility$ DBAdd0 | InstantSpeed$ True | SpellDescription$ Flip a coin. If you win the flip, add {C}{C}. Activate this ability only any time you could cast an instant.
 SVar:DBMana:DB$ Mana | Produced$ C | Amount$ 2
 SVar:DBAdd0:DB$ Mana | Produced$ C | Amount$ 0
+AI:RemoveDeck:All
 Oracle:{1}: Flip a coin. If you win the flip, add {C}{C}. Activate this ability only any time you could cast an instant.
diff --git a/forge-gui/res/cardsfolder/s/steel_squirrel.txt b/forge-gui/res/cardsfolder/s/steel_squirrel.txt
index 1d9545746a3..f5062b502e1 100644
--- a/forge-gui/res/cardsfolder/s/steel_squirrel.txt
+++ b/forge-gui/res/cardsfolder/s/steel_squirrel.txt
@@ -2,7 +2,7 @@ Name:Steel Squirrel
 ManaCost:2
 Types:Artifact Creature Squirrel
 PT:1/1
-T:Mode$ RolledDie | Execute$ TrigPump | ValidPlayer$ You | ValidResult$ GE5 | TriggerDescription$ Whenever you roll a 5 or higher on a die, CARDNAME gets +X/+X until end of turn, where X is the result.
+T:Mode$ RolledDie | Execute$ TrigPump | ValidPlayer$ You | ValidResult$ GE5 | TriggerZones$ Battlefield | TriggerDescription$ Whenever you roll a 5 or higher on a die, CARDNAME gets +X/+X until end of turn, where X is the result.
 SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ X | NumDef$ X
 SVar:X:TriggerCount$Result
 A:AB$ RollDice | Cost$ 6 | AILogic$ Combat | SpellDescription$ Roll a six-sided die.