From 1a2cfc29297919045eef7734250c2a1eea9f7a1c Mon Sep 17 00:00:00 2001
From: Switch-modder <deolrajjyot@gmail.com>
Date: Tue, 9 Jun 2026 18:49:50 -0400
Subject: [PATCH] Re-add keepaway vc

---
 .../types/behaviorComponent/behaviorIDs.clad  |  1 +
 .../types/behaviorComponent/userIntent.clad   |  1 +
 .../voiceCommands/keepawayVoiceCommand.json   | 21 +++++++++++++++++++
 .../reactions/voiceFeatures.json              |  1 +
 .../behaviorComponent/user_intent_map.json    |  4 ++++
 5 files changed, 28 insertions(+)
 create mode 100644 resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/highLevelDelegates/voiceCommands/keepawayVoiceCommand.json

diff --git a/clad/src/clad/types/behaviorComponent/behaviorIDs.clad b/clad/src/clad/types/behaviorComponent/behaviorIDs.clad
index f7eef4f93..a76bf9111 100644
--- a/clad/src/clad/types/behaviorComponent/behaviorIDs.clad
+++ b/clad/src/clad/types/behaviorComponent/behaviorIDs.clad
@@ -311,6 +311,7 @@ enum uint_16 BehaviorID {
   FindYourCubeVoiceCommand,
   FistBumpVoiceCommand,
   GoHomeVoiceCommand,
+  KeepawayVoiceCommand,
   LookAtMeVoiceCommand,
   LookOverThereVoiceCommand,
   PickUpCubeVoiceCommand,
diff --git a/clad/src/clad/types/behaviorComponent/userIntent.clad b/clad/src/clad/types/behaviorComponent/userIntent.clad
index c6569b232..3c49c7a74 100644
--- a/clad/src/clad/types/behaviorComponent/userIntent.clad
+++ b/clad/src/clad/types/behaviorComponent/userIntent.clad
@@ -170,6 +170,7 @@ union dupes_allowed UserIntent
   UserIntent_Void             play_anytrick,
   UserIntent_Void             play_blackjack,
   UserIntent_Void             play_fistbump,
+  UserIntent_Void             play_keepaway,
   UserIntent_Void             play_pickupcube,
   UserIntent_Void             play_popawheelie,
   UserIntent_Void             play_rollcube,
diff --git a/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/highLevelDelegates/voiceCommands/keepawayVoiceCommand.json b/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/highLevelDelegates/voiceCommands/keepawayVoiceCommand.json
new file mode 100644
index 000000000..1c0ab65bf
--- /dev/null
+++ b/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/highLevelDelegates/voiceCommands/keepawayVoiceCommand.json
@@ -0,0 +1,21 @@
+{
+  "behaviorID" : "KeepawayVoiceCommand",
+  "behaviorClass" : "DispatcherQueue",
+
+  "wantsToBeActivatedCondition": {
+    "conditionType": "FeatureGate",
+    "feature": "Keepaway"
+  },
+
+  "respondToUserIntents" : [
+    { "type" : "play_keepaway" }
+  ],
+
+  "behaviors": [
+    "DriveOffChargerCube",
+    "FindCubeAndPlayKeepaway"
+  ],
+
+  "postBehaviorSuggestion": "Socialize"
+
+}
\ No newline at end of file
diff --git a/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/reactions/voiceFeatures.json b/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/reactions/voiceFeatures.json
index 66a16c740..75ec93e8d 100644
--- a/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/reactions/voiceFeatures.json
+++ b/resources/config/engine/behaviorComponent/behaviors/victorBehaviorTree/reactions/voiceFeatures.json
@@ -17,6 +17,7 @@
     "GoHomeVoiceCommand",
     "RollCubeVoiceCommand",
     "PopAWheelieVoiceCommand",
+    "KeepawayVoiceCommand",
     "WireTest",
     "BlackJackVoiceCommand",
     "PRDemoComeHere",
diff --git a/resources/config/engine/behaviorComponent/user_intent_map.json b/resources/config/engine/behaviorComponent/user_intent_map.json
index 7c244528d..215966907 100644
--- a/resources/config/engine/behaviorComponent/user_intent_map.json
+++ b/resources/config/engine/behaviorComponent/user_intent_map.json
@@ -336,6 +336,10 @@
       "user_intent": "imperative_eyecolor",
       "cloud_intent": "intent_imperative_eyecolor",
       "feature_gate": "EyeColorVC"
+    },
+    {
+      "cloud_intent": "intent_play_keepaway",
+      "user_intent": "play_keepaway"
     }
   ],