From c4efe9ae69f7c00d60c833cfb5f9e33b94f3d7d0 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 16:42:41 -0400 Subject: [PATCH 01/44] Add randimp functionality, fix changeMagmaFlow Yes/No menu on magma flow used to not work (it would always think it was yes in the code). --- gator.js | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/gator.js b/gator.js index 9304e5d..9fd1bb8 100644 --- a/gator.js +++ b/gator.js @@ -12,6 +12,8 @@ var carp = 0; var carp2 = 0; var carpMod = 0; var coord = 0; +var randimp = false; +var tauntimpFrequency = 2.97; var efficiency = 0; var capacity = 0; var maxCapacity = 3; @@ -160,6 +162,18 @@ function changeCoord(value) { calculateCurrentPop(); } +function changeRandimp(value) { + if (value == "No" || !value) { + randimp = false; + tauntimpFrequency = 2.97; + } + else { + randimp = true + tauntimpFrequency = 3.366; + } + calculateCurrentPop(); +} + function changeEfficiency(value, mod) { efficiency = parseInt(value); calculateMinTick(); @@ -334,8 +348,8 @@ function changeSlowburn(value) { } function changeMagmaFlow(value) { - if (value == "Yes" || value) magmaFlow = true; - else magmaFlow = false; + if (value == "No" || !value) magmaFlow = false; + else magmaFlow = true; if (magmaFlow) magmaCells = 18; else magmaCells = 16; calculateMagma(); @@ -408,9 +422,9 @@ function calculateCurrentPop() { overclockPop[i] = Math.floor(overclockTicks[i]) * (carpMod * tickRatio) * overclocker; if (i == 0) overclockPopThisZone[0] = Math.max(overclockPop[0], 0); else overclockPopThisZone[i] = Math.max(overclockPop[i] - overclockPop[i - 1], 0); - if (i == 0) popWithTauntimp[0] = Math.floor(overclockPopThisZone[0] * Math.pow(1.003, 2.97)); - else if (useConf) popWithTauntimp[i] = Math.floor((overclockPopThisZone[i] + popWithTauntimp[i - 1]) * Math.pow(confValue, 2.97)); - else popWithTauntimp[i] = Math.floor((overclockPopThisZone[i] + popWithTauntimp[i - 1]) * Math.pow(1.003, 2.97)); + if (i == 0) popWithTauntimp[0] = Math.floor(overclockPopThisZone[0] * Math.pow(1.003, tauntimpFrequency)); + else if (useConf) popWithTauntimp[i] = Math.floor((overclockPopThisZone[i] + popWithTauntimp[i - 1]) * Math.pow(confValue, tauntimpFrequency)); + else popWithTauntimp[i] = Math.floor((overclockPopThisZone[i] + popWithTauntimp[i - 1]) * Math.pow(1.003, tauntimpFrequency)); if (i == 0) sum[0] = overclockPopThisZone[0]; else sum[i] = overclockPopThisZone[i] + sum[i - 1]; popFromTauntimp[i] = popWithTauntimp[i] - sum[i]; @@ -597,6 +611,14 @@ function pasteSave(save) { coord = game.portal.Coordinated.level; changeCoord(coord); document.getElementById("coord").value = coord; + randimp = game.talents.magimp.purchased; + if (randimp) { + changeRandimp(true); + document.getElementById("randimp").value = "Yes"; + } else { + changeRandimp(false); + document.getElementById("randimp").value = "No"; + } efficiency = game.generatorUpgrades.Efficiency.upgrades; changeEfficiency(efficiency); document.getElementById("efficiency").value = efficiency; @@ -862,6 +884,7 @@ function saveSettings() { carp : carp, carp2 : carp2, coord : coord, + randimp : randimp, efficiency : efficiency, capacity : capacity, supply : supply, @@ -893,6 +916,7 @@ function loadSettings() { if (typeof settings.carp != "undefined") carp = settings.carp; if (typeof settings.carp2 != "undefined") carp2 = settings.carp2; if (typeof settings.coord != "undefined") coord = settings.coord; + if (typeof settings.randimp != "undefined") randimp = settings.randimp; if (typeof settings.efficiency != "undefined") efficiency = settings.efficiency; if (typeof settings.capacity != "undefined") capacity = settings.capacity; if (typeof settings.supply != "undefined") supply = settings.supply; @@ -932,6 +956,9 @@ function loadSettings() { document.getElementById("carp2").value = carp2; changeCoord(coord); document.getElementById("coord").value = coord; + changeRandimp(randimp); + if (randimp) document.getElementById("randimp").value = "Yes"; + else document.getElementById("randimp").value = "No"; changeEfficiency(efficiency); document.getElementById("efficiency").value = efficiency; changeCapacity(capacity); @@ -1015,4 +1042,4 @@ function enumerate(x) { return x + "e" + n; } -//Copyright Nohmou, 2018 \ No newline at end of file +//Copyright Nohmou, 2018 From 9772c9253568b2282a7d5411e1d68717464c5718 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 16:44:19 -0400 Subject: [PATCH 02/44] Adding randimp UI --- index.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index f10d490..65d04b8 100644 --- a/index.html +++ b/index.html @@ -57,6 +57,13 @@
 Coordinated


+ Masteries
+  Randimp +
+

DG LevelsNext Upgrade
 Efficiency @@ -252,7 +259,7 @@ This calculator assumes no population before you begin fueling. The population received before your first DG tick is inconsequential to your total population, and won't affect the results shown for the intended users of this page.
- The calculator assumes exactly 2.97 tauntimps received per zone. This averages out to the expected value, but it is possible to have good/bad luck with tauntimps, and have your population thrive/suffer accordingly. + The calculator assumes exactly 2.97 tauntimps received per zone, or 3.366 with the Randimp mastery. This averages out to the expected value, but it is possible to have good/bad luck with tauntimps, and have your population thrive/suffer accordingly.
The calculator assumes all DG ticks made are overclocks. This slightly affects the final results, especially for those with lower overclocker levels, as those non-OC ticks will be stronger that OC ticks, and happen earlier, therefore benefitting more from tauntimp compounding. However, the differences are still small, and largely unnoticable for fueling more than a couple of zones. @@ -277,4 +284,4 @@ - \ No newline at end of file + From 526e9e8456d071478381b652f1db4f685e4ab7ee Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 17:28:37 -0400 Subject: [PATCH 03/44] Update gator.js --- gator.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gator.js b/gator.js index 9fd1bb8..59e3dec 100644 --- a/gator.js +++ b/gator.js @@ -220,6 +220,7 @@ function checkDGUpgrades() { changeFuelStart(230); if (hze > 0) { changeRunEnd(hze); + document.getElementById("runEnd").value = hze; changeFuelEnd(hze); } else { @@ -325,6 +326,7 @@ function checkDGUpgrades() { else document.getElementById("overclockerEfficiency").innerHTML = (overclockerEfficiency / efficiencyEfficiency).toFixed(4); changeRunEnd(myRunEnd); + document.getElementById("runEnd").value = myRunEnd; changeFuelStart(myStart); changeFuelEnd(myEnd); } @@ -658,6 +660,7 @@ function pasteSave(save) { runEnd = game.global.lastPortal; changeRunEnd(runEnd); document.getElementById("runEnd").value = runEnd; + document.getElementById("runEnd").value = runEnd; spiresCleared = game.global.spiresCompleted; changeSpiresCleared(spiresCleared); document.getElementById("spiresCleared").value = spiresCleared; @@ -710,13 +713,17 @@ function minimize(dif, variant) { if (variant == 2) document.getElementById("message").innerHTML = "Calculating..."; changeFuelStart(230); var myEnd = runEnd; - if (variant == 1) changeRunEnd(minimizeZone); + if (variant == 1) { + changeRunEnd(minimizeZone); + document.getElementById("runEnd").value = minimizeZone; + } changeFuelEnd(runEnd); var bestAmals = maxAmals - dif; var bestJ = fuelZones; var maxedAmals = false; if (variant == 1) { changeRunEnd(minimizeZone - 1); + document.getElementById("runEnd").value = minimizeZone -1; changeFuelStart(minimizeZone - 1); } else changeFuelStart(runEnd); From b75efdf5fddbd26f19bcf3bb83071082cc97ef2b Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 17:29:43 -0400 Subject: [PATCH 04/44] Update gator.js --- gator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gator.js b/gator.js index 59e3dec..37326fb 100644 --- a/gator.js +++ b/gator.js @@ -660,7 +660,6 @@ function pasteSave(save) { runEnd = game.global.lastPortal; changeRunEnd(runEnd); document.getElementById("runEnd").value = runEnd; - document.getElementById("runEnd").value = runEnd; spiresCleared = game.global.spiresCompleted; changeSpiresCleared(spiresCleared); document.getElementById("spiresCleared").value = spiresCleared; From a9a001e0cd4010123e12f43efe4d12597703f0be Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 17:50:19 -0400 Subject: [PATCH 05/44] Update index.html --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 65d04b8..f8fb439 100644 --- a/index.html +++ b/index.html @@ -173,11 +173,11 @@ Your Final Ratio0 - Zones of MI0 + Magmite ZOnes0 Zones Withheld- - Zones of Fuel0 + Fuel Zones0 @@ -185,7 +185,7 @@ - Total MI Earned0 + Magmite Earned0 From 35f9a3d4268ba627a14ba191ae19cc1c60f41cbf Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 17:51:12 -0400 Subject: [PATCH 06/44] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index f8fb439..569bca5 100644 --- a/index.html +++ b/index.html @@ -173,7 +173,7 @@ Your Final Ratio0 - Magmite ZOnes0 + Magmite Zones0 Zones Withheld- From 92d8f01747130da79b913aef63a61642eadde7ba Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 17:55:06 -0400 Subject: [PATCH 07/44] Update index.html --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 569bca5..028003f 100644 --- a/index.html +++ b/index.html @@ -173,7 +173,7 @@ Your Final Ratio0 - Magmite Zones0 + Magma Zones0 Zones Withheld- @@ -181,7 +181,7 @@ - Magma Zones0 + Magmite Zones0 From 4f2a899c8bbde010ddee4c7b636b5fb22c44c443 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:02:11 -0400 Subject: [PATCH 08/44] Update gator.js --- gator.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/gator.js b/gator.js index 37326fb..74228b2 100644 --- a/gator.js +++ b/gator.js @@ -326,7 +326,6 @@ function checkDGUpgrades() { else document.getElementById("overclockerEfficiency").innerHTML = (overclockerEfficiency / efficiencyEfficiency).toFixed(4); changeRunEnd(myRunEnd); - document.getElementById("runEnd").value = myRunEnd; changeFuelStart(myStart); changeFuelEnd(myEnd); } @@ -714,7 +713,6 @@ function minimize(dif, variant) { var myEnd = runEnd; if (variant == 1) { changeRunEnd(minimizeZone); - document.getElementById("runEnd").value = minimizeZone; } changeFuelEnd(runEnd); var bestAmals = maxAmals - dif; @@ -722,7 +720,6 @@ function minimize(dif, variant) { var maxedAmals = false; if (variant == 1) { changeRunEnd(minimizeZone - 1); - document.getElementById("runEnd").value = minimizeZone -1; changeFuelStart(minimizeZone - 1); } else changeFuelStart(runEnd); From 20737fa8a2fce293a9763e224c1faa83876d481f Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:23:40 -0400 Subject: [PATCH 09/44] Update gator.js --- gator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gator.js b/gator.js index 74228b2..c2ab3bd 100644 --- a/gator.js +++ b/gator.js @@ -756,7 +756,6 @@ function minimize(dif, variant) { optimize(); if (variant == 1) { changeRunEnd(myEnd); - document.getElementById("runEnd").value = runEnd; } if (variant == 2) { myPop = totalPop; From acf3d62a36a6f5db8b8d2f56ccf0798b4fd516cd Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:37:13 -0400 Subject: [PATCH 10/44] Update gator.js --- gator.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gator.js b/gator.js index c2ab3bd..c7aa442 100644 --- a/gator.js +++ b/gator.js @@ -715,7 +715,7 @@ function minimize(dif, variant) { changeRunEnd(minimizeZone); } changeFuelEnd(runEnd); - var bestAmals = maxAmals - dif; + var bestAmals = finalAmals - dif; var bestJ = fuelZones; var maxedAmals = false; if (variant == 1) { @@ -727,7 +727,7 @@ function minimize(dif, variant) { if (variant == 2) var myCapacity = capacity; while (fuelStart >= 230) { - while (maxAmals >= bestAmals && fuelZones >= 0) { + while (finalAmals >= bestAmals && fuelZones >= 0) { if (variant == 2) { var myPop = totalPop; while (totalPop >= myPop) { @@ -748,7 +748,7 @@ function minimize(dif, variant) { if (fuelStart >= 230) changeFuelStart(fuelStart); if (variant == 1) changeFuelZones(Math.min(minimizeZone - fuelStart, bestJ)); else changeFuelZones(Math.min(runEnd - fuelStart, bestJ)); - if (maxedAmals == true && maxAmals < bestAmals) break; + if (maxedAmals == true && finalAmals < bestAmals) break; } changeFuelZones(bestJ); @@ -761,7 +761,7 @@ function minimize(dif, variant) { myPop = totalPop; for (b = 0; b < 4; b++) { //run this a bunch or something changeCapacity(capacity + 1, 2); - while (totalPop >= myPop && maxAmals >= bestAmals && capacity <= myCapacity) { + while (totalPop >= myPop && finalAmals >= bestAmals && capacity <= myCapacity) { myPop = totalPop; changeCapacity(capacity + 1, 2); } From 935736356fefa6bbba7821281a58c2cdc4c823c1 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:42:29 -0400 Subject: [PATCH 11/44] Update gator.js --- gator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gator.js b/gator.js index c7aa442..4c00fa0 100644 --- a/gator.js +++ b/gator.js @@ -658,7 +658,6 @@ function pasteSave(save) { document.getElementById("hze").value = hze; runEnd = game.global.lastPortal; changeRunEnd(runEnd); - document.getElementById("runEnd").value = runEnd; spiresCleared = game.global.spiresCompleted; changeSpiresCleared(spiresCleared); document.getElementById("spiresCleared").value = spiresCleared; From c7350d1b31a6ad0e5ff6abbdd81f8ed7962a352f Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:50:17 -0400 Subject: [PATCH 12/44] Update gator.js --- gator.js | 1 - 1 file changed, 1 deletion(-) diff --git a/gator.js b/gator.js index 4c00fa0..c2afff3 100644 --- a/gator.js +++ b/gator.js @@ -220,7 +220,6 @@ function checkDGUpgrades() { changeFuelStart(230); if (hze > 0) { changeRunEnd(hze); - document.getElementById("runEnd").value = hze; changeFuelEnd(hze); } else { From 77d5f53284fb5a59e88b5f92b914963fdc9d6caa Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:54:20 -0400 Subject: [PATCH 13/44] Update gator.js --- gator.js | 1 + 1 file changed, 1 insertion(+) diff --git a/gator.js b/gator.js index c2afff3..9b53029 100644 --- a/gator.js +++ b/gator.js @@ -657,6 +657,7 @@ function pasteSave(save) { document.getElementById("hze").value = hze; runEnd = game.global.lastPortal; changeRunEnd(runEnd); + document.getElementById("runEnd") = runEnd; spiresCleared = game.global.spiresCompleted; changeSpiresCleared(spiresCleared); document.getElementById("spiresCleared").value = spiresCleared; From 53b520dd3dc77d21141f49cc5018ae2857784856 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 18:57:43 -0400 Subject: [PATCH 14/44] Update gator.js --- gator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gator.js b/gator.js index 9b53029..2e721aa 100644 --- a/gator.js +++ b/gator.js @@ -657,7 +657,7 @@ function pasteSave(save) { document.getElementById("hze").value = hze; runEnd = game.global.lastPortal; changeRunEnd(runEnd); - document.getElementById("runEnd") = runEnd; + document.getElementById("runEnd").value = runEnd; spiresCleared = game.global.spiresCompleted; changeSpiresCleared(spiresCleared); document.getElementById("spiresCleared").value = spiresCleared; From 932197bc2c6e03df2172ba9ab04bd22804a4b60b Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 19:05:38 -0400 Subject: [PATCH 15/44] Update gator.js --- gator.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gator.js b/gator.js index 2e721aa..03f3550 100644 --- a/gator.js +++ b/gator.js @@ -710,9 +710,7 @@ function minimize(dif, variant) { if (variant == 2) document.getElementById("message").innerHTML = "Calculating..."; changeFuelStart(230); var myEnd = runEnd; - if (variant == 1) { - changeRunEnd(minimizeZone); - } + if (variant == 1) changeRunEnd(minimizeZone); changeFuelEnd(runEnd); var bestAmals = finalAmals - dif; var bestJ = fuelZones; From 4286e330e8b1723c257d26c05a16ab9c51959b32 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 19:53:38 -0400 Subject: [PATCH 16/44] Update index.html --- index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/index.html b/index.html index 028003f..2797c6e 100644 --- a/index.html +++ b/index.html @@ -101,7 +101,7 @@

-
Version
+
Version (Original by Nohmou, forked by Zeralyos)



@@ -272,12 +272,12 @@
I found an error, what can I do? - Please contact me on reddit (u/Nohmou) or discord (@Nohmou#5097) and I'll look at it right away! Screenshots of your settings are helpful in diagnosing any technical issues. + Please contact me on reddit (u/Zeralyos) or discord (@Zeraalyos#3692) and I'll look at it right away! Screenshots of your settings are helpful in diagnosing any technical issues.
Is this up to date? - This was last updated on November 7, 2018. + This was last updated on June 17, 2020.

From 063007d82f12b78680292ad16259ad1c85d9a629 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 19:53:58 -0400 Subject: [PATCH 17/44] Update gator.js --- gator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gator.js b/gator.js index 03f3550..389dd48 100644 --- a/gator.js +++ b/gator.js @@ -1,5 +1,5 @@ window.onload = setup; -var version = "1.5"; +var version = "1.6"; var hze = 0; var ticked = false; var fuelStart = 230; From c4a550e4d0668d567d003eda02b2970ab8998fae Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Wed, 17 Jun 2020 20:08:09 -0400 Subject: [PATCH 18/44] Update index.html --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 2797c6e..e49512c 100644 --- a/index.html +++ b/index.html @@ -101,7 +101,7 @@

-
Version (Original by Nohmou, forked by Zeralyos)
+



From 5a16f65e60e1564f8d3cc0542f39b89dec8eb800 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 18 Jun 2020 13:01:13 -0400 Subject: [PATCH 19/44] Blank functions named --- gatorTest.js | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 gatorTest.js diff --git a/gatorTest.js b/gatorTest.js new file mode 100644 index 0000000..1eafdf5 --- /dev/null +++ b/gatorTest.js @@ -0,0 +1,165 @@ +window.onload = setup; +var version = "1.6"; +var hze = 0; +var ticked = false; +var fuelStart = 230; +var fuelEnd = 230; +var fuelZones = fuelEnd - fuelStart; +var runEnd = 230; +var housingMod = 1; +var spiresCleared = 0; +var carp = 0; +var carp2 = 0; +var carpMod = 0; +var coord = 0; +var randimp = false; +var tauntimpFrequency = 2.97; +var efficiency = 0; +var capacity = 0; +var maxCapacity = 3; +var supply = 0; +var maxSupply = 0.2; +var overclock = 0; +var overclocker = 0; +var storage = 2; +var slowburn = 0.4; +var magmaFlow = true; +var magmaCells = 18; +var popPerTick = 0; +var minTick = 0; +var maxTick = 0; +var tickRatio = 0; + +var efficiencyCost = 8; +var capacityCost = 32; +var supplyCost = 64; +var overclockerCost = 512; + +var totalPop = 0; +var currentPop = []; +var finalAmals = 0; +var tauntimpPercent = 0; +var maxAmals = 0; +var lastCoord = 0; +var finalAmalZone = 0; +var neededPop = 0; +var finalArmySize = 0; +var coordIncrease = 0; +var coordinations = []; +var finalAmalRatio = 0; +var yourFinalRatio = 0; +var zonesOfMI = 0; +var magmaZones = 0; +var totalMI = 0; + +var ar1 = 10000000000; +var ar2; +var ar3; +var ar4; +var ar5; + +var uncoords = 0; +var uncoordsZone = -1; +var uncoordsGoal = 1; +var fuelThisZone = []; +var totalFuel = []; +var overclockTicks = []; +var overclockPop = []; +var overclockPopThisZone = []; +var popWithTauntimp = []; +var popFromTauntimp = []; +var percentFromTauntimp = []; +var tauntimpThisZone = []; +var coordPop = []; +var amalRatio = []; +var adjustedRatio = []; +var currentAmals = []; + +var minimizeZone = 230; +var gatorZone = 230; +var offset = false; + +function setup() { + loadSettings(); + document.getElementById("version").innerHTML = version; +} + +function changeFuelStart() {} + +function changeFuelEnd() {} + +function changeFuelZones() {} + +function changeRunEnd() {} + +function changeHousingMod() {} + +function changeSpiresCleared() {} + +function changeCarp() {} + +function changeCarp2() {} + +function changeCoord() {} + +function changeRandimp() {} + +function changeEfficiency() {} + +function changeCapacity() {} + +function changeSupply() {} + +function changeOverclocker() {} + +function checkDGUpgrades() {} + +function changeHZE() {} + +function changeStorage() {} + +function changeSlowburn() {} + +function changeMagmaFlow() {} + +function calculateMagma() {} + +function calculateCoordIncrease() {} + +function calculateFinalAmalRatio() {} + +function calculateCarpMod() {} + +function calculateMinTick() {} + +function calculateMaxTick() {} + +function calculateCurrentPop() {} + +function pasteSave(save) {} + +function clearText() { + +function optimize() { + +function minimize() {} + +function changeMinimizeZone() {} + +function forceGator() {} + +function changeGatorZone() {} + +function changeWithheldCoords() {} + +function changeWithheldCoordsZone() {} + +function changeGatorGoal() {} + +function saveSettings() {} + +function loadSettings() {} + +function openFAQ() {} + +function enumerate() {} From 8dbd192aee92d4d7955d0f8b43940ec383818664 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 18 Jun 2020 13:26:49 -0400 Subject: [PATCH 20/44] Testing pattern attribute --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index e49512c..c533702 100644 --- a/index.html +++ b/index.html @@ -20,22 +20,22 @@

Run Stats




From 2a4e49b09da3355d3a0f4ee29db48cca5daaf9c3 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 18 Jun 2020 13:29:21 -0400 Subject: [PATCH 21/44] Update index.html --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index c533702..e49512c 100644 --- a/index.html +++ b/index.html @@ -20,22 +20,22 @@

Run Stats




From 31f7a65e0bc523df6e1340d03db06faba5734f7d Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 18 Jun 2020 14:06:23 -0400 Subject: [PATCH 22/44] Create testIndex.html --- testIndex.html | 287 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 287 insertions(+) create mode 100644 testIndex.html diff --git a/testIndex.html b/testIndex.html new file mode 100644 index 0000000..0727091 --- /dev/null +++ b/testIndex.html @@ -0,0 +1,287 @@ + + + + Fueling and Amalgamator Calculator + + + + + + + +
+
+ + +
+ + +

+ Run Stats
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +


+ Perk Levels
+  Carpentry +
+
+  Carpentry II +
+
+  Coordinated +


+ Masteries
+  Randimp +
+

+ DG LevelsNext Upgrade
+  Efficiency + +
+
+  Capacity + +
+
+  Supply + +
+
+  Overclocker + +
+ + Push Run Goal:  +

+ DG Upgrades
+  Storage +
+  Slowburn +
+  Magma Flow +
+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +


+
+
+
+

Results
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Total Population0Final Amals0
% from Tauntimps0Max Amals0
Last Coord-@ Zone0
Needed Pop0Final Army Size0
Increase per Coord0Final Amal Ratio0
Your Final Ratio0
Magma Zones0Zones Withheld-
Fuel Zones0
Magmite Zones0
Magmite Earned0
Max Supply @ Zone0
+
+ + + + + + + +
RangeExtra GatorNeeded Pop MultUnbought Coords
230-300
301-400
401-500
501-600
601+
+
+ + + + + From 9202cfcce18334e6ca64494106824b4a31ddb25d Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 18 Jun 2020 14:06:46 -0400 Subject: [PATCH 23/44] Rename testIndex.html to indexTest.html --- testIndex.html => indexTest.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename testIndex.html => indexTest.html (100%) diff --git a/testIndex.html b/indexTest.html similarity index 100% rename from testIndex.html rename to indexTest.html From c34db828838b340d0208f8e080b0b6ff89b4719c Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 00:05:37 -0400 Subject: [PATCH 24/44] Added setup() and changeFuelStart() --- gatorTest.js | 53 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index 1eafdf5..b88e148 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -4,27 +4,26 @@ var hze = 0; var ticked = false; var fuelStart = 230; var fuelEnd = 230; -var fuelZones = fuelEnd - fuelStart; +var fuelZones = 0; var runEnd = 230; var housingMod = 1; var spiresCleared = 0; -var carp = 0; -var carp2 = 0; -var carpMod = 0; -var coord = 0; -var randimp = false; +var carpentry = 0; +var carpentry2 = 0; +var carpenryMod = 0; +var coordinated = 0; var tauntimpFrequency = 2.97; var efficiency = 0; +var efficiencyMod = 1 var capacity = 0; var maxCapacity = 3; var supply = 0; var maxSupply = 0.2; -var overclock = 0; var overclocker = 0; -var storage = 2; -var slowburn = 0.4; -var magmaFlow = true; -var magmaCells = 18; +var overclockRate = 0; +var storage = 1; +var fuelPerTick = 0.5; +var magmaCellsPerZone = 16; var popPerTick = 0; var minTick = 0; var maxTick = 0; @@ -39,18 +38,19 @@ var totalPop = 0; var currentPop = []; var finalAmals = 0; var tauntimpPercent = 0; -var maxAmals = 0; +var maxAmalgamators = 0; var lastCoord = 0; -var finalAmalZone = 0; +var finalAmalgamatorZone = 0; var neededPop = 0; var finalArmySize = 0; -var coordIncrease = 0; -var coordinations = []; +var coordinationArmyIncrease = 0; +var ArmySizes = []; +var coordinationThresholds; var finalAmalRatio = 0; var yourFinalRatio = 0; -var zonesOfMI = 0; var magmaZones = 0; -var totalMI = 0; +var magmiteZones = 0; +var totalMagmite = 0; var ar1 = 10000000000; var ar2; @@ -58,9 +58,9 @@ var ar3; var ar4; var ar5; -var uncoords = 0; -var uncoordsZone = -1; -var uncoordsGoal = 1; +var withheldCoords = 0; +var withholdStopZone = -1; +var totalGatorGoal = 1; var fuelThisZone = []; var totalFuel = []; var overclockTicks = []; @@ -84,7 +84,18 @@ function setup() { document.getElementById("version").innerHTML = version; } -function changeFuelStart() {} +function changeFuelStart(value) { + fuelStart = Math.max(230, parseInt(value)); + document.getElementById("fuelStart").value = fuelStart + if (fuelEnd < fuelStart) { + fuelEnd = fuelStart; + document.getElementbyId("fuelEnd").value = fuelEnd; + } + if (runEnd < fuelStart) { + runEnd = fuelStart; + document.getElementById("runEnd").value = runEnd; + } +} function changeFuelEnd() {} From d35f5c2249a710b46a155b9bf75dd76419de31f7 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 00:08:27 -0400 Subject: [PATCH 25/44] Update gatorTest.js --- gatorTest.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index b88e148..79a3abb 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -149,9 +149,9 @@ function calculateCurrentPop() {} function pasteSave(save) {} -function clearText() { +function clearText() {} -function optimize() { +function optimize() {} function minimize() {} From f0029d73c050d6469304acb3191f82be20e9a16e Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 00:10:01 -0400 Subject: [PATCH 26/44] Update gatorTest.js --- gatorTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatorTest.js b/gatorTest.js index 79a3abb..d3c71d6 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -89,7 +89,7 @@ function changeFuelStart(value) { document.getElementById("fuelStart").value = fuelStart if (fuelEnd < fuelStart) { fuelEnd = fuelStart; - document.getElementbyId("fuelEnd").value = fuelEnd; + document.getElementById("fuelEnd").value = fuelEnd; } if (runEnd < fuelStart) { runEnd = fuelStart; From 89b45a1b734939b071f3f7909b29ef321e384548 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 00:12:15 -0400 Subject: [PATCH 27/44] Finished changeFuelStart() --- gatorTest.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gatorTest.js b/gatorTest.js index d3c71d6..bd76594 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -95,6 +95,8 @@ function changeFuelStart(value) { runEnd = fuelStart; document.getElementById("runEnd").value = runEnd; } + fuelZones = fuelEnd - fuelStart; + document.getElementById("fuelZones").value = fuelZones; } function changeFuelEnd() {} From 386fdcc81759fa31b3b93276c9bf71340e125e40 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 00:37:39 -0400 Subject: [PATCH 28/44] Added changeFuelEnd, changeFuelZones, changeRunEnd --- gatorTest.js | 47 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 6 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index bd76594..01eb1bb 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -80,7 +80,7 @@ var gatorZone = 230; var offset = false; function setup() { - loadSettings(); + loadSettings(); //Load document.getElementById("version").innerHTML = version; } @@ -91,19 +91,54 @@ function changeFuelStart(value) { fuelEnd = fuelStart; document.getElementById("fuelEnd").value = fuelEnd; } - if (runEnd < fuelStart) { - runEnd = fuelStart; + if (runEnd < fuelEnd) { + runEnd = fuelEnd; document.getElementById("runEnd").value = runEnd; } fuelZones = fuelEnd - fuelStart; document.getElementById("fuelZones").value = fuelZones; } -function changeFuelEnd() {} +function changeFuelEnd(value) { + fuelEnd = Math.max(230, parseInt(value)); + document.getElementById("fuelEnd").value = fuelEnd; + if (fuelStart > fuelEnd) { + fuelStart = fuelEnd; + document.getElementById("fuelStart").value = fuelStart; + } + if (runEnd < fuelEnd) { + runEnd = fuelEnd; + document.getElementById("runEnd").value = runEnd; + } + fuelZones = fuelEnd - fuelStart; + document.getElementById("fuelZones").value = fuelZones; +} -function changeFuelZones() {} +function changeFuelZones(value) { + fuelZones = Math.max(0, parseInt(value)); + document.getElementById("fuelZones").value = fuelZones; + fuelEnd = fuelStart + fuelZones; + document.getElementById("fuelEnd").value = fuelEnd; + if (runEnd < fuelEnd) { + runEnd = fuelEnd; + document.getElementById("runEnd").value = runEnd; + } +} -function changeRunEnd() {} +function changeRunEnd(value) { + runEnd = Math.max(1, parseInt(value)); + document.getElementById("runEnd").value = runEnd; + if (fuelStart > runEnd) { + fuelStart = fuelEnd; + document.getElementById("fuelStart").value = fuelStart; + } + if (fuelEnd > runEnd) { + fuelEnd = runEnd; + document.getElementById("fuelEnd").value = fuelEnd; + fuelZones = fuelEnd - fuelStart; + document.getElementById("fuelZones").value = fuelZones; + } +} function changeHousingMod() {} From 545ab72343cbe746d741ec19cbe141ea0205fa87 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 00:42:13 -0400 Subject: [PATCH 29/44] Fixed changeRunEnd --- gatorTest.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gatorTest.js b/gatorTest.js index 01eb1bb..d7505cb 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -129,7 +129,7 @@ function changeRunEnd(value) { runEnd = Math.max(1, parseInt(value)); document.getElementById("runEnd").value = runEnd; if (fuelStart > runEnd) { - fuelStart = fuelEnd; + fuelStart = runEnd; document.getElementById("fuelStart").value = fuelStart; } if (fuelEnd > runEnd) { From 5cdeb038c7efb2e0f59a2600e40db63426f13339 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 01:20:53 -0400 Subject: [PATCH 30/44] Added functions changeHousingMod, changeSpiresCleared, changeCarpentry, changeCarpentry2, calculateCarpentryMod --- gatorTest.js | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index d7505cb..05c3ce4 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -10,7 +10,7 @@ var housingMod = 1; var spiresCleared = 0; var carpentry = 0; var carpentry2 = 0; -var carpenryMod = 0; +var carpentryMod = 0; var coordinated = 0; var tauntimpFrequency = 2.97; var efficiency = 0; @@ -86,7 +86,6 @@ function setup() { function changeFuelStart(value) { fuelStart = Math.max(230, parseInt(value)); - document.getElementById("fuelStart").value = fuelStart if (fuelEnd < fuelStart) { fuelEnd = fuelStart; document.getElementById("fuelEnd").value = fuelEnd; @@ -101,7 +100,6 @@ function changeFuelStart(value) { function changeFuelEnd(value) { fuelEnd = Math.max(230, parseInt(value)); - document.getElementById("fuelEnd").value = fuelEnd; if (fuelStart > fuelEnd) { fuelStart = fuelEnd; document.getElementById("fuelStart").value = fuelStart; @@ -116,7 +114,6 @@ function changeFuelEnd(value) { function changeFuelZones(value) { fuelZones = Math.max(0, parseInt(value)); - document.getElementById("fuelZones").value = fuelZones; fuelEnd = fuelStart + fuelZones; document.getElementById("fuelEnd").value = fuelEnd; if (runEnd < fuelEnd) { @@ -127,7 +124,6 @@ function changeFuelZones(value) { function changeRunEnd(value) { runEnd = Math.max(1, parseInt(value)); - document.getElementById("runEnd").value = runEnd; if (fuelStart > runEnd) { fuelStart = runEnd; document.getElementById("fuelStart").value = fuelStart; @@ -140,13 +136,30 @@ function changeRunEnd(value) { } } -function changeHousingMod() {} +function changeHousingMod(value) { + housingMod = parsefloat(value); + if (housingMod < 0) { + housingMod = 1 + housingMod / 100; + document.getElementById("housingMod").value = housingMod; + } +} + +function changeSpiresCleared(value) { + spiresCleared = Math.min(7, Math.max(0, parseInt(value))); +} -function changeSpiresCleared() {} +function changeCarpentry(value) { + carpentry = Math.max(0, parseInt(value)); + calculateCarpentryMod(); +} -function changeCarp() {} +function changeCarpentry2(value) { + carpentry2 = Math.max(0, parseInt(value)); +} -function changeCarp2() {} +function calculateCarpentryMod() { + carpentryMod = Math.pow(1.1, carpentry) * (1+ 0.0025 * carpentry2); +} function changeCoord() {} @@ -176,8 +189,6 @@ function calculateCoordIncrease() {} function calculateFinalAmalRatio() {} -function calculateCarpMod() {} - function calculateMinTick() {} function calculateMaxTick() {} From 87923dc4b8f069b09eb7234319828639ffed36e8 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Fri, 19 Jun 2020 01:23:35 -0400 Subject: [PATCH 31/44] Update indexTest.html --- indexTest.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indexTest.html b/indexTest.html index 0727091..fa6861e 100644 --- a/indexTest.html +++ b/indexTest.html @@ -49,13 +49,13 @@


Perk Levels
-  Carpentry +  Carpentry
-  Carpentry II +  Carpentry II
-  Coordinated +  Coordinated


Masteries
 Randimp
-

+  Magma Flow +


DG LevelsNext Upgrade
 Efficiency @@ -93,11 +97,6 @@  Slowburn -
-  Magma Flow

From fbaf1e326b6e936128ef6797e3e5ab4a9e06efa5 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Mon, 22 Jun 2020 19:16:45 -0400 Subject: [PATCH 38/44] Update gatorTest.js --- gatorTest.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index d92fd01..aa1b43e 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -8,11 +8,17 @@ var fuelZones = 0; var runEnd = 230; var housingMod = 1; var spiresCleared = 0; + var carpentry = 0; var carpentry2 = 0; var carpentryMod = 0; var coordinated = 0; + +var randimp = false; var tauntimpFrequency = 2.97; +var magmaFlow = false; +var magmaCellsPerZone = 16; + var efficiency = 0; var efficiencyMod = 1 var capacity = 0; @@ -21,9 +27,11 @@ var supply = 0; var maxSupply = 0.2; var overclocker = 0; var overclockRate = 0; + +var storage = false; var storage = 1; +var slowburn = false; var fuelPerTick = 0.5; -var magmaCellsPerZone = 16; var popPerTick = 0; var minTick = 0; var maxTick = 0; @@ -53,10 +61,10 @@ var magmiteZones = 0; var totalMagmite = 0; var ar1 = 10000000000; -var ar2; -var ar3; -var ar4; -var ar5; +var ar2 = 1000000000; +var ar3 = 100000000; +var ar4 = 10000000; +var ar5 = 1000000; var withheldCoords = 0; var withholdStopZone = -1; @@ -172,7 +180,7 @@ function calculateCoordinationIncrease() { document.getElementById("coordinationArmyIncrease").textContent = coordinationArmyIncrease.toFixed(4) + "%"; } -function changeRandimp() {} +function changeRandimp(value) {} function changeEfficiency() {} From 4225d44a70928d6ac6e669da398cdbbadcd902c2 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 25 Jun 2020 00:06:24 -0400 Subject: [PATCH 39/44] Update indexTest.html --- indexTest.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexTest.html b/indexTest.html index 9013daf..34d0bfd 100644 --- a/indexTest.html +++ b/indexTest.html @@ -271,7 +271,7 @@
I found an error, what can I do? - Please contact me on reddit (u/Zeralyos) or discord (@Zeraalyos#3692) and I'll look at it right away! Screenshots of your settings are helpful in diagnosing any technical issues. + Please contact me on reddit (u/Zeralyos) or discord (@Zeralyos#3692) and I'll look at it right away! Screenshots of your settings are helpful in diagnosing any technical issues.
Is this up to date? From 138d43bcdd4848dfd2b82006a6d3f34155f79553 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 25 Jun 2020 02:21:54 -0400 Subject: [PATCH 40/44] Update gatorTest.js --- gatorTest.js | 62 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index aa1b43e..bd5e04b 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -1,7 +1,7 @@ window.onload = setup; var version = "1.6"; -var hze = 0; -var ticked = false; +var hze = 1; +var lockedRunStats = false; var fuelStart = 230; var fuelEnd = 230; var fuelZones = 0; @@ -24,6 +24,7 @@ var efficiencyMod = 1 var capacity = 0; var maxCapacity = 3; var supply = 0; +var supplyCap = 230; var maxSupply = 0.2; var overclocker = 0; var overclockRate = 0; @@ -58,7 +59,7 @@ var finalAmalRatio = 0; var yourFinalRatio = 0; var magmaZones = 0; var magmiteZones = 0; -var totalMagmite = 0; +var magmiteEarned = 0; var ar1 = 10000000000; var ar2 = 1000000000; @@ -180,28 +181,61 @@ function calculateCoordinationIncrease() { document.getElementById("coordinationArmyIncrease").textContent = coordinationArmyIncrease.toFixed(4) + "%"; } -function changeRandimp(value) {} +function changeRandimp(value) { + randimp = value; + if (value) tauntimpFrequency = 2.97; + else tauntimpFrequency = 3.366; +} + +function changeMagmaFlow(value) { + magmaFlow = value; + if (value) magmaCellsPerZone = 18; + else magmaCellsPerZone = 16; +} -function changeEfficiency() {} +function calculateMagma() { + magmaZones = runEnd - fuelStart; + document.getElementById("magmaZones").textContent = magmaZones; + + document.getElementById("fuelZones").textContent = fuelZones; + + magmiteZones = magmaZones - fuelZones; + document.getElementById("magmiteZones").textContent = magmiteZones; + + magmiteEarned = magmiteZones * magmaCelsPerZone; + document.getElementById("magmiteEarned").textContent = magmiteEarned; +} + +function changeEfficiency(value) { + efficiency = Math.max(0, parseInt(value)); + efficiencyMod = 1 + efficiency / 10; +} -function changeCapacity() {} +function changeCapacity(value) { + capacity = Math.max(0, parseint(value)); + maxCapacity = 3 + capacity * 0.4; +} -function changeSupply() {} +function changeSupply(value) { + supply = Math.max(0, parseInt(value)); + maxSupply = 0.2 + 0.02 * supply; +} -function changeOverclocker() {} +function changeOverclocker(value) { + overclocker = Math.max(0, parseInt(value)); + overclockRate = 1 - 0.50 * Math.pow(0.99, overclocker); +} -function checkDGUpgrades() {} +function checkDimensionalGeneratorUpgrades() {} -function changeHZE() {} +function changeHZE(value) { + hze = Math.max(1, parseInt(value)); +} function changeStorage() {} function changeSlowburn() {} -function changeMagmaFlow() {} - -function calculateMagma() {} - function calculateFinalAmalRatio() {} function calculateMinTick() {} From 6600bd35f4adf883c36c4016a2da114abff16713 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 25 Jun 2020 13:19:08 -0400 Subject: [PATCH 41/44] Update indexTest.html --- indexTest.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indexTest.html b/indexTest.html index 34d0bfd..751e2ee 100644 --- a/indexTest.html +++ b/indexTest.html @@ -1,7 +1,7 @@ - Fueling and Amalgamator Calculator + GatorCalc Test Version From 6de91aeadc0e03fc69603b14903b060a125fdac9 Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 25 Jun 2020 16:30:13 -0400 Subject: [PATCH 42/44] Update indexTest.html --- indexTest.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/indexTest.html b/indexTest.html index 751e2ee..fb79f37 100644 --- a/indexTest.html +++ b/indexTest.html @@ -17,6 +17,9 @@ +
+

Run Stats
From f01566698eb7709e031dee104b9a437a8d36d77d Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Thu, 25 Jun 2020 17:55:28 -0400 Subject: [PATCH 43/44] Update gatorTest.js --- gatorTest.js | 85 +++++++++++++++++++--------------------------------- 1 file changed, 31 insertions(+), 54 deletions(-) diff --git a/gatorTest.js b/gatorTest.js index bd5e04b..02e85a7 100644 --- a/gatorTest.js +++ b/gatorTest.js @@ -30,62 +30,46 @@ var overclocker = 0; var overclockRate = 0; var storage = false; -var storage = 1; +var storageMod = 1; var slowburn = false; var fuelPerTick = 0.5; var popPerTick = 0; -var minTick = 0; -var maxTick = 0; -var tickRatio = 0; var efficiencyCost = 8; var capacityCost = 32; var supplyCost = 64; var overclockerCost = 512; +var efficiencyValue = 1; +var capacityValue = 1; +var supplyValue = 1; +var overclockerValue = 0; + var totalPop = 0; +var finalArmySize = 0; +var maxAmalgamators = 0; +var finalAmalgamators = 0; +var finalAmalgamatorZone = 0; + +var magmaZones = 0; +var magmiteZones = 0; +var magmiteEarned = 0; var currentPop = []; -var finalAmals = 0; + var tauntimpPercent = 0; -var maxAmalgamators = 0; + var lastCoordination = 0; -var finalAmalgamatorZone = 0; + var neededPop = 0; -var finalArmySize = 0; + var coordinationArmyIncrease = 0; var armySizes = []; var coordinationThresholds = []; var finalAmalRatio = 0; var yourFinalRatio = 0; -var magmaZones = 0; -var magmiteZones = 0; -var magmiteEarned = 0; -var ar1 = 10000000000; -var ar2 = 1000000000; -var ar3 = 100000000; -var ar4 = 10000000; -var ar5 = 1000000; - -var withheldCoords = 0; -var withholdStopZone = -1; -var totalGatorGoal = 1; -var fuelThisZone = []; -var totalFuel = []; -var overclockTicks = []; -var overclockPop = []; -var overclockPopThisZone = []; -var popWithTauntimp = []; -var popFromTauntimp = []; -var percentFromTauntimp = []; -var tauntimpThisZone = []; -var coordPop = []; -var amalRatio = []; -var adjustedRatio = []; -var currentAmals = []; var minimizeZone = 230; -var gatorZone = 230; var offset = false; function setup() { @@ -223,7 +207,8 @@ function changeSupply(value) { function changeOverclocker(value) { overclocker = Math.max(0, parseInt(value)); - overclockRate = 1 - 0.50 * Math.pow(0.99, overclocker); + if (overclocker = 0) overclockRate = 0; + else overclockRate = 1 - 0.50 * Math.pow(0.99, overclocker-1); } function checkDimensionalGeneratorUpgrades() {} @@ -232,21 +217,23 @@ function changeHZE(value) { hze = Math.max(1, parseInt(value)); } -function changeStorage() {} - -function changeSlowburn() {} - -function calculateFinalAmalRatio() {} - -function calculateMinTick() {} +function changeStorage(value) { + storage = value; + if (storage) storageMod = 2; + else storageMod = 1; +} -function calculateMaxTick() {} +function changeSlowburn(value) { + slowburn = value; + if (slowwburn) fuelPerTick = 0.4; + else fuelPerTick = 0.5; +} function calculateCurrentPop() {} function pasteSave(save) {} -function clearText() {} +function clearSaveBox() {} function optimize() {} @@ -254,16 +241,6 @@ function minimize() {} function changeMinimizeZone() {} -function forceGator() {} - -function changeGatorZone() {} - -function changeWithheldCoords() {} - -function changeWithheldCoordsZone() {} - -function changeGatorGoal() {} - function saveSettings() {} function loadSettings() {} From 18d06319b9b34baefe0d68ec633b413f902884da Mon Sep 17 00:00:00 2001 From: Zeralyos Date: Tue, 13 Oct 2020 13:46:26 -0400 Subject: [PATCH 44/44] Update index.html --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index e49512c..c25b3f4 100644 --- a/index.html +++ b/index.html @@ -63,6 +63,10 @@  Randimp
+  Magma Flow

DG LevelsNext Upgrade
 Efficiency @@ -94,10 +98,6 @@  Slowburn
-  Magma Flow