From 13376d0ced470378d1a63c461323f18af5f7dbba Mon Sep 17 00:00:00 2001
From: Agetian <stavdev@mail.ru>
Date: Mon, 21 Aug 2017 04:50:49 +0000
Subject: [PATCH] - Improved handling of script execution in GameState to
 support subabilities and KW Awaken (other keywords with mana cost might need
 similar treatment later).

---
 .../src/main/java/forge/ai/GameState.java     | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/forge-ai/src/main/java/forge/ai/GameState.java b/forge-ai/src/main/java/forge/ai/GameState.java
index d92dd261b5c..9c7076c91bb 100644
--- a/forge-ai/src/main/java/forge/ai/GameState.java
+++ b/forge-ai/src/main/java/forge/ai/GameState.java
@@ -652,15 +652,38 @@ public abstract class GameState {
                 System.err.println("ERROR: Unable to find SA with index " + numSA + " on card " + c + " to execute!");
             }
         } else {
-            if (!c.hasSVar(sPtr)) {
-                System.err.println("ERROR: Unable to find SVar " + sPtr + " on card " + c + " + to execute!");
-                return;
-            }
+            // Special handling for keyworded abilities
+            if (sPtr.startsWith("KW#")) {
+                String kwName = sPtr.substring(3);
+                FCollectionView<SpellAbility> saList = c.getSpellAbilities();
 
-            String svarValue = c.getSVar(sPtr);
-            sa = AbilityFactory.getAbility(svarValue, c);
-            if (sa == null) {
-                System.err.println("ERROR: Unable to generate ability for SVar " + svarValue);
+                if (kwName.equals("Awaken")) {
+                    for (SpellAbility ab : saList) {
+                        if (ab.getDescription().startsWith("Awaken")) {
+                            ab.setActivatingPlayer(c.getController());
+                            ab.getSubAbility().setActivatingPlayer(c.getController());
+                            sa = ab;
+                            // target for Awaken is set in its first subability
+                            handleScriptedTargetingForSA(game, sa.getSubAbility(), tgtID);
+                        }
+                    }
+                    if (sa == null) {
+                        System.err.println("ERROR: Could not locate keyworded ability Awaken in card " + c + " to execute!");
+                        return;
+                    }
+                }
+            } else {
+                // SVar-based script execution
+                if (!c.hasSVar(sPtr)) {
+                    System.err.println("ERROR: Unable to find SVar " + sPtr + " on card " + c + " + to execute!");
+                    return;
+                }
+
+                String svarValue = c.getSVar(sPtr);
+                sa = AbilityFactory.getAbility(svarValue, c);
+                if (sa == null) {
+                    System.err.println("ERROR: Unable to generate ability for SVar " + svarValue);
+                }
             }
         }
 
@@ -668,6 +691,13 @@ public abstract class GameState {
         handleScriptedTargetingForSA(game, sa, tgtID);
 
         sa.resolve();
+
+        // resolve subabilities
+        SpellAbility subSa = sa.getSubAbility();
+        while (subSa != null) {
+            subSa.resolve();
+            subSa = subSa.getSubAbility();
+        }
     }
 
     private void handlePrecastSpells(final Game game) {