Max Tox not disabled mid run anymore

AutoTrimps2.js

@@ -52,7 +52,7 @@ function initializeAutoTrimps() {
     ATscriptLoad('','SettingsGUI');   //populate Settings GUI
     ATscriptLoad('','Graphs');        //populate Graphs
     //Load modules:
-    ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'client-server', 'perks', /* 'perky', */ 'fight-info', 'performance'];
+    ATmoduleList = ['query', 'portal', 'upgrades', 'heirlooms', 'buildings', 'jobs', 'equipment', 'gather', 'stance', 'battlecalc', 'maps', 'breedtimer', 'dynprestige', 'fight', 'scryer', 'magmite', 'other', 'import-export', 'perks', /* 'perky', */ 'fight-info', 'performance', 'equality', 'mainWrapper'];
     for (var m in ATmoduleList) {
         ATscriptLoad(modulepath, ATmoduleList[m]);
     }
@@ -216,15 +216,16 @@ function mainLoop() {
     if (getPageSetting('BuyStorage'))  buyStorage();     //"Buy Storage"     (buildings.js)
     if (getPageSetting('BuyBuildings')) buyBuildings();  //"Buy Buildings"    (buildings.js)
     if (getPageSetting('BuyJobs')) buyJobs();            //"Buy Jobs"            (jobs.js)
-    if (getPageSetting('ManualGather2')<=2) manualLabor();  //"Auto Gather/Build"       (gather.js)
-    else if (getPageSetting('ManualGather2')==3) manualLabor2();  //"Auto Gather/Build #2"  (")
+    autoGatherIfTurnedOn();                              ////"Auto Gather/Build"       (gather.js)
     getPageSetting('AutoMaps') > 0 ? autoMap() : updateAutoMapsStatus(); //"Auto Maps"      (automaps.js)
     if (getPageSetting('GeneticistTimer') >= 0) autoBreedTimer(); //"Geneticist Timer" / "Auto Breed Timer"     (autobreedtimer.js)
     if (autoTrimpSettings.AutoPortal.selected != "Off") autoPortal();   //"Auto Portal" (hidden until level 40) (portal.js)
-    if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); //"Trap Trimps"
+    //#55 @todo move to gather.js
+    //if (getPageSetting('TrapTrimps') && game.global.trapBuildAllowed && game.global.trapBuildToggled == false) toggleAutoTrap(); //"Trap Trimps"
     if (aWholeNewWorld && getPageSetting('AutoRoboTrimp')) autoRoboTrimp();   //"AutoRoboTrimp" (other.js)
     if (aWholeNewWorld && getPageSetting('FinishC2')>0 && game.global.runningChallengeSquared) finishChallengeSquared(); // "Finish Challenge2" (other.js)
     autoLevelEquipment();           //"Buy Armor", "Buy Armor Upgrades", "Buy Weapons", "Buy Weapons Upgrades"  (equipment.js)
+    if (getPageSetting('ManagedEquality')) equality.manageEquality();
     if (getPageSetting('UseScryerStance'))  useScryerStance();  //"Use Scryer Stance"   (scryer.js)
     else if (getPageSetting('AutoStance')<=1) autoStance();     //"Auto Stance"       (autostance.js)
     else if (getPageSetting('AutoStance')==2) autoStance2();    //"Auto Stance #2"         (")
@@ -235,6 +236,7 @@ function mainLoop() {
     else autoTrimpSettings.Prestige.selected = document.getElementById('Prestige').value; //just make sure the UI setting and the internal setting are aligned.
     if (getPageSetting('AutoMagmiteSpender2')==2 && !magmiteSpenderChanged)  autoMagmiteSpender();   //Auto Magmite Spender (magmite.js)
     if (getPageSetting('AutoNatureTokens')) autoNatureTokens();     //Nature     (other.js)
+    if (getPageSetting('AutoNatureTokens')) autoNatureEmpowerment();     //Nature empowerments (other.js)
     //
     //Runs any user provided scripts, see line 253 below
     if (userscriptOn) userscripts();

Graphs.js

@@ -30,7 +30,7 @@ document.getElementById("graphParent").innerHTML += '<div id="graphFooter" style
 var $graphFooter = document.getElementById('graphFooterLine1');
 //$graphFooter.innerHTML += '\
 //Create the dropdown for what graph to show    (these correspond to headings in setGraph() and have to match)
-var graphList = ['Helium - He/Hr', 'Helium - Total', 'Helium - He/Hr Instant', 'Helium - He/Hr Delta', 'HeHr % / LifetimeHe', 'He % / LifetimeHe', 'Clear Time', 'Cumulative Clear Time', 'Run Time', 'Map Bonus', 'Void Maps', 'Void Map History', 'Loot Sources', 'Coordinations', 'GigaStations', 'Unused Gigas', 'Last Warpstation', 'Trimps', 'Nullifium Gained', 'Dark Essence', 'Dark Essence PerHour', 'OverkillCells', 'Magmite', 'Magmamancers', 'Fluffy XP', 'Fluffy XP PerHour', 'Nurseries'];
+var graphList = ['Helium - He/Hr', 'Radon - Ra/Hr', 'Helium - Total', 'Helium - He/Hr Instant', 'Helium - He/Hr Delta', 'HeHr % / LifetimeHe', 'He % / LifetimeHe', 'Clear Time', 'Cumulative Clear Time', 'Run Time', 'Map Bonus', 'Void Maps', 'Void Map History', 'Loot Sources', 'Coordinations', 'GigaStations', 'Unused Gigas', 'Last Warpstation', 'Trimps', 'Nullifium Gained', 'Dark Essence', 'Dark Essence PerHour', 'OverkillCells', 'Magmite', 'Magmamancers', 'Fluffy XP', 'Fluffy XP PerHour', 'Scruffy XP', 'Scruffy XP PerHour', 'Nurseries', 'Bones', 'Worshippers'];
 var $graphSel = document.createElement("select");
 $graphSel.id = 'graphSelection';
 $graphSel.setAttribute("style", "");
@@ -276,11 +276,11 @@ function clearData(portal,clrall) {
     if(!portal)
         portal = 0;
     if (!clrall) {
-        while(allSaveData[0].totalPortals < game.global.totalPortals - portal) {
+        while(allSaveData[0].totalPortals < game.global.totalPortals + game.global.totalRadPortals - portal) {
             allSaveData.shift();
         }
     } else {
-        while(allSaveData[0].totalPortals != game.global.totalPortals) {
+        while(allSaveData[0].totalPortals != game.global.totalPortals + game.global.totalRadPortals) {
             allSaveData.shift();
         }
     }
@@ -359,8 +359,9 @@ function pushData() {
     var lifetime = (game.resources.helium.owned / (game.global.totalHeliumEarned-game.resources.helium.owned))*100;
 
     allSaveData.push({
-        totalPortals: game.global.totalPortals,
+        totalPortals: game.global.totalPortals + game.global.totalRadPortals,
         heliumOwned: game.resources.helium.owned,
+	    radonOwned: game.resources.radon.owned,
         currentTime: new Date().getTime(),
         portalTime: game.global.portalTime,
         world: game.global.world,
@@ -382,32 +383,16 @@ function pushData() {
         magmite: game.global.magmite,
         magmamancers: game.jobs.Magmamancer.owned,
         fluffy: game.global.fluffyExp,
-        nursery: game.buildings.Nursery.purchased
+        scruffy: game.global.fluffyExp2,
+        nursery: game.buildings.Nursery.purchased,
+        worshipper: game.jobs.Worshipper.owned,
+        bones: game.global.b
     });
     //only keep 15 portals worth of runs to prevent filling storage
     clearData(15);
     safeSetItems('allSaveData', JSON.stringify(allSaveData));
 }
 
-//TODO: Cloud Analytics - Experimental function to start tracking graphing data on the cloud server.
-// we want this to be small so we don't transmit the whole 10MB graph-data.
-var graphAnal = [];
-function trackHourlyGraphAnalytics() {
-    graphAnal.push({
-        currentTime: new Date().getTime(),
-        totalPortals: game.global.totalPortals,
-        heliumOwned: game.resources.helium.owned,
-        highzone: game.global.highestLevelCleared,
-        bones: game.global.b
-        //ratio: document.getElementById("ratioPreset").value
-    });
-    safeSetItems('graphAnal', JSON.stringify(graphAnal));
-}
-//Run once.
-trackHourlyGraphAnalytics();
-//then set Timer loop for 1 hour;
-setInterval(trackHourlyGraphAnalytics, 3600000);
-
 function initializeData() {
     //initialize fresh with a blank array if needed
     if (allSaveData === null) {
@@ -442,9 +427,9 @@ function gatherInfo() {
     //make sure data structures are ready
     initializeData();
     //Track portal.
-    GraphsVars.aWholeNewPortal = GraphsVars.currentPortal != game.global.totalPortals;
+    GraphsVars.aWholeNewPortal = GraphsVars.currentPortal != game.global.totalPortals + game.global.totalRadPortals;
     if (GraphsVars.aWholeNewPortal) {
-        GraphsVars.currentPortal = game.global.totalPortals;
+        GraphsVars.currentPortal = game.global.totalPortals + game.global.totalRadPortals;
         //clear filtered loot data upon portaling. < 5 check to hopefully throw out bone portal shenanigans
         filteredLoot = {
             'produced': {metal: 0, wood: 0, food: 0, gems: 0},
@@ -863,6 +848,17 @@ function setGraphData(graph) {
             yType = 'Linear';
             yminFloor=0;
             break;
+	case 'Radon - Ra/Hr':
+            graphData = allPurposeGraph('radonhr',true,null,
+                    function specialCalc(e1,e2) {
+                        return Math.floor(e1.radonOwned / ((e1.currentTime - e1.portalTime) / 3600000));
+                    });
+            title = 'Radon/Hour (Cumulative)';
+            xTitle = 'Zone';
+            yTitle = 'Radon/Hour';
+            yType = 'Linear';
+            yminFloor=0;
+            break;
         case 'Helium - Total':
             graphData = allPurposeGraph('heliumOwned',true,null,
                     function specialCalc(e1,e2) {
@@ -966,31 +962,7 @@ function setGraphData(graph) {
             var currentPortal = -1;
             var currentZone = -1;
             var startEssence = 0;
-            graphData = [];
-            for (var i in allSaveData) {
-                if (allSaveData[i].totalPortals != currentPortal) {
-                    graphData.push({
-                        name: 'Portal ' + allSaveData[i].totalPortals + ': ' + allSaveData[i].challenge,
-                        data: []
-                    });
-                    currentPortal = allSaveData[i].totalPortals;
-                    currentZone = 0;
-                    startEssence = allSaveData[i].essence;
-                }
-                //runs extra checks for mid-run imports, and pushes 0's to align to the right zone properly.
-                if (currentZone != allSaveData[i].world - 1) {
-                    var loop = allSaveData[i].world - 1 - currentZone;
-                    while (loop > 0) {
-                        graphData[graphData.length - 1].data.push(0);
-                        loop--;
-                    }
-                }
-                //write datapoint (one of 3 ways)
-                if (currentZone != 0) {
-                    graphData[graphData.length - 1].data.push(Math.floor((allSaveData[i].essence - startEssence) / ((allSaveData[i].currentTime - allSaveData[i].portalTime) / 3600000)));
-                }
-                currentZone = allSaveData[i].world;
-            }
+            graphData = hourlyGraph('essence');
             title = 'Dark Essence/Hour (Cumulative)';
             xTitle = 'Zone';
             yTitle = 'Dark Essence/Hour';
@@ -1000,11 +972,16 @@ function setGraphData(graph) {
         case 'Nurseries':
             graphData = allPurposeGraph('nursery',true,"number");
             title = 'Nurseries Bought (Total)';
-            xTitle = 'Zone';// (starting at your NoNurseriesUntil setting)';
+            xTitle = 'Zone';
             yTitle = 'Nursery';
             yType = 'Linear';
-            // if (getPageSetting('NoNurseriesUntil'))
-                // xminFloor = getPageSetting('NoNurseriesUntil');
+            break;
+        case 'Bones':
+            graphData = allPurposeGraph('bones',true,"number");
+            title = 'Bones Found (Total)';
+            xTitle = 'Zone';
+            yTitle = 'Bones';
+            yType = 'Linear';
             break;
         case 'Fluffy XP':
             graphData = allPurposeGraph('fluffy',true,"number");
@@ -1018,45 +995,37 @@ function setGraphData(graph) {
             var currentPortal = -1;
             var currentZone = -1;
             var startFluffy = 0;
-            graphData = [];
-            for (var i in allSaveData) {
-                if (allSaveData[i].totalPortals != currentPortal) {
-                    graphData.push({
-                        name: 'Portal ' + allSaveData[i].totalPortals + ': ' + allSaveData[i].challenge,
-                        data: []
-                    });
-                    currentPortal = allSaveData[i].totalPortals;
-                    currentZone = 0;
-                    startFluffy = allSaveData[i].fluffy;
-                }
-                //runs extra checks for mid-run imports, and pushes 0's to align to the right zone properly.
-                /*if (currentZone != allSaveData[i].world - 1) {
-                    var loop = allSaveData[i].world - 1 - currentZone;
-                    while (loop > 0) {
-                        graphData[graphData.length - 1].data.push(0);
-                        loop--;
-                    }
-                }*/
-                    if (currentZone != allSaveData[i].world - 1) {
-                        //console.log(allSaveData[i].totalPortals + " / " + allSaveData[i].world);
-                        var loop = allSaveData[i].world - 1 - currentZone;
-                        while (loop > 0) {
-                            graphData[graphData.length - 1].data.push(allSaveData[i-1][item]*1);
-                            loop--;
-                        }
-                    }
-                //write datapoint (one of 3 ways)
-                if (currentZone != 0) {
-                    graphData[graphData.length - 1].data.push(Math.floor((allSaveData[i].fluffy - startFluffy) / ((allSaveData[i].currentTime - allSaveData[i].portalTime) / 3600000)));
-                }
-                currentZone = allSaveData[i].world;
-            }
+            graphData = hourlyGraph('fluffy');
             title = 'Fluffy XP/Hour (Cumulative)';
             xTitle = 'Zone (starts at 300)';
             yTitle = 'Fluffy XP/Hour';
             yType = 'Linear';
             xminFloor = 300;
             break;
+        case 'Scruffy XP':
+            graphData = allPurposeGraph('scruffy',true,"number");
+            title = 'Scruffy XP (Lifetime Total)';
+            xTitle = 'Zone';
+            yTitle = 'Scruffy XP';
+            yType = 'Linear';
+            break;
+        case 'Scruffy XP PerHour':
+            var currentPortal = -1;
+            var currentZone = -1;
+            var startFluffy = 0;
+            graphData = hourlyGraph('scruffy');
+            title = 'Scruffy XP/Hour (Cumulative)';
+            xTitle = 'Zone';
+            yTitle = 'Scruffy XP/Hour';
+            yType = 'Linear';
+            break;
+        case 'Worshippers':
+            graphData = allPurposeGraph('worshipper',true,"number");
+            title = 'Worshippers Active';
+            xTitle = 'Zone';
+            yTitle = 'Worshippers';
+            yType = 'Linear';
+            break;
         case 'OverkillCells':
             var currentPortal = -1;
             graphData = [];
@@ -1092,6 +1061,34 @@ function setGraphData(graph) {
             break;
     }//end of switch(graph)
 
+    function hourlyGraph(item) {
+        graphData = [];
+        for (var i in allSaveData) {
+            if (allSaveData[i].totalPortals != currentPortal) {
+                graphData.push({
+                    name: 'Portal ' + allSaveData[i].totalPortals + ': ' + allSaveData[i].challenge,
+                    data: []
+                });
+                currentPortal = allSaveData[i].totalPortals;
+                currentZone = 0;
+                startingValue = allSaveData[i][item]*1;
+            }
+            //runs extra checks for mid-run imports, and pushes 0's to align to the right zone properly.
+            if (currentZone != allSaveData[i].world - 1) {
+                var loop = allSaveData[i].world - 1 - currentZone;
+                while (loop > 0) {
+                    graphData[graphData.length - 1].data.push(0);
+                    loop--;
+                }
+            }
+            if (currentZone != 0) {
+                graphData[graphData.length - 1].data.push(Math.floor((allSaveData[i][item]*1 - startingValue) / ((allSaveData[i].currentTime - allSaveData[i].portalTime) / 3600000)));
+            }
+            currentZone = allSaveData[i].world;
+        }
+        return graphData;
+    }
+
     //(internal) default function used to draw non-specific graphs (and some specific ones)
     function allPurposeGraph(item,extraChecks,typeCheck,funcToRun,useAccumulator) {
         var currentPortal = -1;
@@ -1133,13 +1130,11 @@ function setGraphData(graph) {
                 var num = funcToRun(allSaveData[i],allSaveData[i-1]);
                 if (num < 0) num = 1;
                 graphData[graphData.length - 1].data.push(num);
-            }
-            else if (funcToRun && useAccumulator && currentZone != 0) {
+            } else if (funcToRun && useAccumulator && currentZone != 0) {
                 accumulator += funcToRun(allSaveData[i],allSaveData[i-1]);
                 if (accumulator < 0) accumulator = 1;
                 graphData[graphData.length - 1].data.push(accumulator);
-            }
-            else {
+            } else {
                 if (allSaveData[i][item] >= 0)
                     graphData[graphData.length - 1].data.push(allSaveData[i][item]*1);
                 else if (extraChecks)
@@ -1149,12 +1144,13 @@ function setGraphData(graph) {
         }
         return graphData;
     }
+
     //default formatter used (can define a decimal precision, and a suffix)
     formatter = formatter || function () {
         var ser = this.series;
         return '<span style="color:' + ser.color + '" >●</span> ' +
-                ser.name + ': <b>' +
-                Highcharts.numberFormat(this.y, precision,'.', ',') + valueSuffix + '</b><br>';
+                ser.name + ' <b>' +
+                prettify(this.y) + valueSuffix + '</b><br>';//#34 - changed formatting to Trimps own prettification
     };
     var additionalParams = {};
     //Makes everything happen.
@@ -1337,13 +1333,13 @@ setInterval(getLootData, 15000);
 
   // who even thought copying the code was a good idea?
   const oldFunction = window.addResCheckMax;
-  window.addResCheckMax = (a, b, c, d, e) => filterLoot(a, b, null, d) || oldFunction(a, b, c, d, e);
+  window.addResCheckMax = (a, b, c, d, e, f) => filterLoot(a, b, null, d) || oldFunction(a, b, c, d, e, f);
 })();
 //END overwriting default game functions!!!!!!!!!!!!!!!!!!!!!!
 
 function lookUpZoneData(zone,portal) {
     if (portal == null)
-        portal = game.global.totalPortals;
+        portal = game.global.totalPortals + game.global.totalRadPortals;
     for (var i=allSaveData.length-1,end=0; i >= 0; i--) {
         if (allSaveData[i].totalPortals != portal) continue;
         if (allSaveData[i].world != zone) continue;