Skip to content

Commit

Permalink
little fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
genbtc committed Apr 8, 2018
1 parent 5ac731a commit 703435f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 2 additions & 1 deletion Graphs.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $graphFooter.innerHTML += '\
<div style="flex:auto; margin-left: 0.5vw;"><button onclick="deleteSpecific(); drawGraph();">Delete Specific Portal</button></div>\
<div style="flex:0 100 5%;"></div>\
<div style="flex:auto;"><button onclick="GraphsImportExportTooltip(\'ExportGraphs\', null, \'update\')" onmouseover=\'tooltip(\"Tips\", \"customText\", event, \"Export Graph Database will make a backup of all the graph data to a text string.<b>DISCLAIMER:</b> Takes quite a long time to generate.\")\' onmouseout=\'tooltip(\"hide\")\'>Export your Graph Database</button></div>\
<div style="float:right; margin-right: 0.5vw;"><button onclick="addGraphNoteLabel()">Add Note/Label</button></div>\
\
<div style="float:right; margin-right: 0.5vw;"><button onclick="toggleSpecificGraphs()">Invert Selection</button></div>\
<div style="float:right; margin-right: 1vw;"><button onclick="toggleAllGraphs()">All Off/On</button></div>';
//TODO: make the overall hover tooltip better and seperate individual help into each button tooltip.
Expand All @@ -68,6 +68,7 @@ document.getElementById("graphFooterLine2").innerHTML += '\
<input onclick="toggleDarkGraphs()" style="height: 20px; float: right; margin-right: 0.5vw;" type="checkbox" id="blackCB">\
<span style="float: right; margin-right: 0.5vw;">Black Graphs:</span>';
//handle the locking mechanism checkbox for the Clear all previous data button:
//<div style="float:right; margin-right: 0.5vw;"><button onclick="addGraphNoteLabel()">Add Note/Label</button></div>\
function toggleClearButton() {
document.getElementById('clrAllDataBtn').disabled=!document.getElementById('clrChkbox').checked;
}
Expand Down
6 changes: 1 addition & 5 deletions modules/other.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ function autoGoldenUpgradesAT(setting) {
if (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";
if (challSQ) //always buy battle during max then helium mode.
setting = "Battle";
setting = (challSQ) ? "Battle" : "Helium"; //always buy battle during max then helium mode.
}
//buy one upgrade per loop.
var success = buyGoldenUpgrade(setting);
Expand All @@ -55,8 +53,6 @@ function autoGoldenUpgradesAT(setting) {
} else if (goldStrat == "Zone") {
var goldZone = getPageSetting('goldZone');
setting = (game.global.world <= goldZone || noBat) ? "Helium" : "Battle";
} else if (goldStrat == "Max then Helium") {
setting = (challSQ) ? "Battle" : "Helium";
} else
setting = (challSQ) ? "Battle" : "Helium";
buyGoldenUpgrade(setting);
Expand Down

0 comments on commit 703435f

Please sign in to comment.