From 5abed7726259dbc60717778656618c5d19d8d642 Mon Sep 17 00:00:00 2001
From: gen BTC <genBTC@gmx.com>
Date: Mon, 26 Mar 2018 19:34:44 -0400
Subject: [PATCH] challsQ2

(cherry picked from commit 705f1361f3ccacdf27195766714183bd41d846d0)
---
 modules/other.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/other.js b/modules/other.js
index 928b1e719..ee10e9f9a 100644
--- a/modules/other.js
+++ b/modules/other.js
@@ -22,18 +22,19 @@ function autoRoboTrimp() {
 function autoGoldenUpgradesAT(setting) {
     var num = getAvailableGoldenUpgrades();
     if (num == 0) return;       //if we have nothing to buy, exit.
+    //Challenge^2 cant Get/Buy Helium, so adapt - do Derskagg mod.
+    var challSQ = game.global.runningChallengeSquared;
     //Try to achieve 60% Void
     //Default: True = Always get 60% void by skipping the 12% upgrade then buying 14%/16%
     var goldStrat = getPageSetting('goldStrat');
-    if (setting == "Void" && goldStrat == "Max then Helium") {
+    if (!challSQ && setting == "Void" && goldStrat == "Max then Helium") {
       var nextVoidAmt = game.goldenUpgrades.Void.nextAmt().toFixed(2);
       if (nextVoidAmt == 0.12)   //skip the 6th void upgrade
         setting = "Helium";
     }
     //buy one upgrade per loop.
     var success = buyGoldenUpgrade(setting);
-    //Challenge^2 cant Get/Buy Helium, so adapt - do Derskagg mod.
-    var challSQ = game.global.runningChallengeSquared;        
+
     var doDerskaggChallSQ = false;
     if (setting == "Helium" && challSQ && !success)
         doDerskaggChallSQ = true;